dts: change all txlx/axg/g12a/g12b dts to use spicc upstream driver.

PD#164751: dts: change all txlx/axg/g12a/g12b dts to use spicc upstream driver.

1. change to use the unified name "spicc0/1".
2. change axg compatible from "amlogic, spicc" to "amlogic,meson-axg-spicc"
   to use upstream driver.
3. change txlx compatible from "amlogic, spicc" to "amlogic,meson-txlx-spicc"
   to use upstream driver.
3. change g12a compatible from "amlogic, spicc" to "amlogic,meson-g12a-spicc"
   to use upstream driver.
4. add node of "amlogic,meson-g12b-spicc" for g12b to use upstream driver.

Change-Id: I587127361fa2ada48332cc01857f2200709d597e
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>

diff --git a/arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts b/arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts
index 497c02f..4a7a969 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts
@@ -943,22 +943,18 @@
 }; /* end of pinctrl_periphs */
 /* Audio Related End */
 
-&spicc_a{
+&spicc0 {
        status = "okay";
-       num_chipselect = <1>;
-       dma_en = <0>;
-       delay_control = <0x15>;
-       cs_delay = <10>;
-       enhance_dlyctl = <0>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&spi0_pins>;
+       cs-gpios = <&gpio GPIOZ_3 0>;
 };
 
-&spicc_b{
+&spicc1 {
        status = "disabled";
-       num_chipselect = <1>;
-       dma_en = <0>;
-       delay_control = <0x15>;
-       cs_delay = <10>;
-       enhance_dlyctl = <0>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&spi1_x_pins>;
+       cs-gpios = <&gpio GPIOX_16 0>;
 };
 
 &aobus{

diff --git a/arch/arm64/boot/dts/amlogic/axg_a113x_skt.dts b/arch/arm64/boot/dts/amlogic/axg_a113x_skt.dts
index 387430e..af04dc7 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/axg_a113x_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_a113x_skt.dts
@@ -937,25 +937,6 @@
 }; /* end of pinctrl_periphs */
 /* Audio Related End */
 
-
-&spicc_a{
-       status = "disabled";
-       num_chipselect = <1>;
-       dma_en = <0>;
-       delay_control = <0x15>;
-       cs_delay = <10>;
-       enhance_dlyctl = <0>;
-};
-
-&spicc_b{
-       status = "disabled";
-       num_chipselect = <1>;
-       dma_en = <0>;
-       delay_control = <0x15>;
-       cs_delay = <10>;
-       enhance_dlyctl = <0>;
-};
-
 &aobus{
        uart_AO: serial@3000 {
                compatible = "amlogic, meson-uart";

diff --git a/arch/arm64/boot/dts/amlogic/axg_pxp.dts b/arch/arm64/boot/dts/amlogic/axg_pxp.dts
index 1a710c7..3795549 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/axg_pxp.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_pxp.dts
@@ -607,25 +607,6 @@
 }; /* end of pinctrl_periphs */
 /* Audio Related End */
 
-
-&spicc_a{
-       status = "disabled";
-       num_chipselect = <1>;
-       dma_en = <0>;
-       delay_control = <0x15>;
-       cs_delay = <10>;
-       enhance_dlyctl = <0>;
-};
-
-&spicc_b{
-       status = "disabled";
-       num_chipselect = <1>;
-       dma_en = <0>;
-       delay_control = <0x15>;
-       cs_delay = <10>;
-       enhance_dlyctl = <0>;
-};
-
 &aobus{
        uart_AO: serial@3000 {
                compatible = "amlogic, meson-uart";

diff --git a/arch/arm64/boot/dts/amlogic/axg_s400.dts b/arch/arm64/boot/dts/amlogic/axg_s400.dts
index f092040..9b299bd 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/axg_s400.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_s400.dts
@@ -1377,25 +1377,6 @@
 }; /* end of pinctrl_periphs */
 /* Audio Related End */
 
-
-&spicc_a{
-       status = "disabled";
-       num_chipselect = <1>;
-       dma_en = <0>;
-       delay_control = <0x15>;
-       cs_delay = <10>;
-       enhance_dlyctl = <0>;
-};
-
-&spicc_b{
-       status = "disabled";
-       num_chipselect = <1>;
-       dma_en = <0>;
-       delay_control = <0x15>;
-       cs_delay = <10>;
-       enhance_dlyctl = <0>;
-};
-
 &aobus{
        uart_AO: serial@3000 {
                compatible = "amlogic, meson-uart";

diff --git a/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts b/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts
index 4eb1dfc..966d5be 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts
@@ -1315,24 +1315,6 @@
 }; /* end of pinctrl_periphs */
 /* Audio Related End */
 
-&spicc_a{
-       status = "disabled";
-       num_chipselect = <1>;
-       dma_en = <0>;
-       delay_control = <0x15>;
-       cs_delay = <10>;
-       enhance_dlyctl = <0>;
-};
-
-&spicc_b{
-       status = "disabled";
-       num_chipselect = <1>;
-       dma_en = <0>;
-       delay_control = <0x15>;
-       cs_delay = <10>;
-       enhance_dlyctl = <0>;
-};
-
 &aobus{
        uart_AO: serial@3000 {
                compatible = "amlogic, meson-uart";

diff --git a/arch/arm64/boot/dts/amlogic/axg_s400emmc.dts b/arch/arm64/boot/dts/amlogic/axg_s400emmc.dts
index b26cb90..bf2ecf4 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/axg_s400emmc.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_s400emmc.dts
@@ -1198,24 +1198,6 @@
 }; /* end of pinctrl_periphs */
 /* Audio Related End */
 
-&spicc_a{
-       status = "disabled";
-       num_chipselect = <1>;
-       dma_en = <0>;
-       delay_control = <0x15>;
-       cs_delay = <10>;
-       enhance_dlyctl = <0>;
-};
-
-&spicc_b{
-       status = "disabled";
-       num_chipselect = <1>;
-       dma_en = <0>;
-       delay_control = <0x15>;
-       cs_delay = <10>;
-       enhance_dlyctl = <0>;
-};
-
 &aobus{
        uart_AO: serial@3000 {
                compatible = "amlogic, meson-uart";

diff --git a/arch/arm64/boot/dts/amlogic/axg_s400emmc_512m.dts b/arch/arm64/boot/dts/amlogic/axg_s400emmc_512m.dts
index aeea998..1e679df 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/axg_s400emmc_512m.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_s400emmc_512m.dts
@@ -1233,24 +1233,6 @@
 }; /* end of pinctrl_periphs */
 /* Audio Related End */
 
-&spicc_a{
-       status = "disabled";
-       num_chipselect = <1>;
-       dma_en = <0>;
-       delay_control = <0x15>;
-       cs_delay = <10>;
-       enhance_dlyctl = <0>;
-};
-
-&spicc_b{
-       status = "disabled";
-       num_chipselect = <1>;
-       dma_en = <0>;
-       delay_control = <0x15>;
-       cs_delay = <10>;
-       enhance_dlyctl = <0>;
-};
-
 &aobus{
        uart_AO: serial@3000 {
                compatible = "amlogic, meson-uart";

diff --git a/arch/arm64/boot/dts/amlogic/axg_s400emmc_v03.dts b/arch/arm64/boot/dts/amlogic/axg_s400emmc_v03.dts
index 51bc061..a633909 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/axg_s400emmc_v03.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_s400emmc_v03.dts
@@ -1199,24 +1199,6 @@
 }; /* end of pinctrl_periphs */
 /* Audio Related End */
 
-&spicc_a{
-       status = "disabled";
-       num_chipselect = <1>;
-       dma_en = <0>;
-       delay_control = <0x15>;
-       cs_delay = <10>;
-       enhance_dlyctl = <0>;
-};
-
-&spicc_b{
-       status = "disabled";
-       num_chipselect = <1>;
-       dma_en = <0>;
-       delay_control = <0x15>;
-       cs_delay = <10>;
-       enhance_dlyctl = <0>;
-};
-
 &aobus{
        uart_AO: serial@3000 {
                compatible = "amlogic, meson-uart";

diff --git a/arch/arm64/boot/dts/amlogic/axg_s420.dts b/arch/arm64/boot/dts/amlogic/axg_s420.dts
index 7e9619b..9ddde2c 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/axg_s420.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_s420.dts
@@ -1130,25 +1130,6 @@
 }; /* end of pinctrl_periphs */
 /* Audio Related End */
 
-
-&spicc_a{
-       status = "disabled";
-       num_chipselect = <1>;
-       dma_en = <0>;
-       delay_control = <0x15>;
-       cs_delay = <10>;
-       enhance_dlyctl = <0>;
-};
-
-&spicc_b{
-       status = "disabled";
-       num_chipselect = <1>;
-       dma_en = <0>;
-       delay_control = <0x15>;
-       cs_delay = <10>;
-       enhance_dlyctl = <0>;
-};
-
 &aobus{
        uart_AO: serial@3000 {
                compatible = "amlogic, meson-uart";

diff --git a/arch/arm64/boot/dts/amlogic/axg_s420_128m.dts b/arch/arm64/boot/dts/amlogic/axg_s420_128m.dts
index bc99032..91649b5 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/axg_s420_128m.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_s420_128m.dts
@@ -1003,25 +1003,6 @@
 }; /* end of pinctrl_periphs */
 /* Audio Related End */
 
-
-&spicc_a{
-       status = "disabled";
-       num_chipselect = <1>;
-       dma_en = <0>;
-       delay_control = <0x15>;
-       cs_delay = <10>;
-       enhance_dlyctl = <0>;
-};
-
-&spicc_b{
-       status = "disabled";
-       num_chipselect = <1>;
-       dma_en = <0>;
-       delay_control = <0x15>;
-       cs_delay = <10>;
-       enhance_dlyctl = <0>;
-};
-
 &aobus{
        uart_AO: serial@3000 {
                compatible = "amlogic, meson-uart";

diff --git a/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts b/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts
index 61435dc..9040189 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts
@@ -1136,25 +1136,6 @@
 }; /* end of pinctrl_periphs */
 /* Audio Related End */
 
-
-&spicc_a{
-       status = "disabled";
-       num_chipselect = <1>;
-       dma_en = <0>;
-       delay_control = <0x15>;
-       cs_delay = <10>;
-       enhance_dlyctl = <0>;
-};
-
-&spicc_b{
-       status = "disabled";
-       num_chipselect = <1>;
-       dma_en = <0>;
-       delay_control = <0x15>;
-       cs_delay = <10>;
-       enhance_dlyctl = <0>;
-};
-
 &aobus{
        uart_AO: serial@3000 {
                compatible = "amlogic, meson-uart";

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts
index 6f4f519..88966bb 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts
@@ -1089,7 +1089,6 @@
        pinctrl-names = "default";
        pinctrl-0 = <&spicc0_pins_x>;
        cs-gpios = <&gpio GPIOX_10 0>;
-       num_chipselect = <1>;
 };
 
 &spicc1 {
@@ -1097,7 +1096,6 @@
        pinctrl-names = "default";
        pinctrl-0 = <&spicc1_pins>;
        cs-gpios = <&gpio GPIOH_6 0>;
-       num_chipselect = <1>;
 };
 
 &pwm_ef {

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts
index 2c8550e..56bc1a0 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts
@@ -999,15 +999,13 @@
        pinctrl-names = "default";
        pinctrl-0 = <&spicc0_pins_x>;
        cs-gpios = <&gpio GPIOX_10 0>;
-       num_chipselect = <1>;
 };
 
 &spicc1 {
-       status = "okay";
+       status = "disabled";
        pinctrl-names = "default";
        pinctrl-0 = <&spicc1_pins>;
        cs-gpios = <&gpio GPIOH_6 0>;
-       num_chipselect = <1>;
 };
 
 &pwm_ef {

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
index 77cc900..733da9c 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
@@ -1279,3 +1279,9 @@
        status = "okay";
 };
 
+&spicc1 {
+       status = "disabled";
+       pinctrl-names = "default";
+       pinctrl-0 = <&spicc1_pins>;
+       cs-gpios = <&gpio GPIOH_6 0>;
+};

diff --git a/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi b/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi
index eb91b87..cca0c31 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi
@@ -409,6 +409,30 @@
                                clock-names = "clk_i2c";
                                clock-frequency = <100000>;
                        };
+
+                       spicc0: spi@13000 {
+                               compatible = "amlogic,meson-axg-spicc";
+                               reg = <0x0 0x13000 0x0 0x40>;
+                               interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&clkc CLKID_SPICC0>,
+                                        <&clkc CLKID_SPICC_COMP>;
+                               clock-names = "core", "comp";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
+
+                       spicc1: spi@15000 {
+                               compatible = "amlogic,meson-axg-spicc";
+                               reg = <0x0 0x15000 0x0 0x40>;
+                               interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&clkc CLKID_SPICC1>,
+                                        <&clkc CLKID_SPICC_COMP>;
+                               clock-names = "core", "comp";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
                }; /* end of cbus */
 
                aobus: aobus@ff800000 {
@@ -529,46 +553,6 @@
                status = "disabled";
        };
 
-       spicc_a:spicc_a {
-               compatible = "amlogic, spicc";
-               status = "disabled";
-               reg = <0x0 0xffd13000 0x0 0x3c>;
-               clocks = <&clkc CLKID_SPICC0>,
-                       <&clkc CLKID_SPICC_COMP>;
-               clock-names = "spicc_clk",
-                       "cts_spicc_hclk";
-               interrupts = <0 81 1>;
-               device_id = <0>;
-               enhance = <1>;
-               pinctrl-names= "default";
-               pinctrl-0=<&spicc_a_pins>;
-               dma_tx_threshold = <3>;
-               dma_rx_threshold = <3>;
-               dma_num_per_read_burst = <3>;
-               dma_num_per_write_burst = <3>;
-               ssctl = <0>;
-       };
-
-       spicc_b:spicc_b {
-               compatible = "amlogic, spicc";
-               status = "disabled";
-               reg = <0x0 0xffd15000 0x0 0x3c>;
-               clocks = <&clkc CLKID_SPICC1>,
-                       <&clkc CLKID_SPICC_COMP>;
-               clock-names = "spicc_clk",
-                       "cts_spicc_hclk";
-               interrupts = <0 82 1>;
-               device_id = <1>;
-               enhance = <1>;
-               pinctrl-names= "default";
-               pinctrl-0=<&spicc_b_pins_X>;
-               dma_tx_threshold = <3>;
-               dma_rx_threshold = <3>;
-               dma_num_per_read_burst = <3>;
-               dma_num_per_write_burst = <3>;
-               ssctl = <0>;
-       };
-
        remote:rc@0xff808040 {
                compatible = "amlogic, aml_remote";
                dev_name = "meson-remote";
@@ -998,32 +982,29 @@
                };
        };
 
-       spicc_a_pins: spicc_a_pins{
+       spi0_pins: spi0 {
                mux {
                        groups = "spi0_clk",
                                "spi0_mosi",
-                               "spi0_miso",
-                               "spi0_ss0";
+                               "spi0_miso";
                        function = "spi0";
                };
        };
 
-       spicc_b_pins_A: spicc_b_pins_A{
+       spi1_a_pins: spi1_a {
                mux {
-                       groups ="spi1_mosi_a",
-                               "spi1_miso_a",
-                               "spi1_clk_a",
-                               "spi1_ss0_a";
+                       groups = "spi1_clk_a",
+                               "spi1_mosi_a",
+                               "spi1_miso_a";
                        function = "spi1";
                };
        };
 
-       spicc_b_pins_X: spicc_b_pins_X{
+       spi1_x_pins: spi1_x {
                mux {
-                       groups = "spi1_mosi_x",
-                               "spi1_miso_x",
-                               "spi1_clk_x",
-                               "spi1_ss0_x";
+                       groups = "spi1_clk_x",
+                               "spi1_mosi_x",
+                               "spi1_miso_x";
                        function = "spi1";
                };
        };

diff --git a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi
index 907cc4a..a19da76 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi
@@ -630,38 +630,24 @@
                        };
 
                        spicc0: spi@13000 {
-                               compatible = "amlogic, spicc";
-                               reg = <0x0 0x13000 0x0 0x40>;
+                               compatible = "amlogic,meson-g12a-spicc";
+                               reg = <0x0 0x13000 0x0 0x44>;
                                interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
-                               clock-names = "spicc_clk";
-                               clocks = <&clkc CLKID_SPICC0_COMP>;
-                               clk_rate = <666666666>;
-                               device_id = <0>;
-                               enhance = <1>;
-                               ssctl = <0>;
-                               dma_tx_threshold = <3>;
-                               dma_num_per_read_burst = <13>;
-                               dma_auto_param = <1>;
-                               delay_control = <0x15>;
+                               clocks = <&clkc CLKID_SPICC0>,
+                                        <&clkc CLKID_SPICC0_COMP>;
+                               clock-names = "core", "comp";
                                #address-cells = <1>;
                                #size-cells = <0>;
                                status = "disabled";
                        };
 
                        spicc1: spi@15000 {
-                               compatible = "amlogic, spicc";
-                               reg = <0x0 0x15000 0x0 0x40>;
+                               compatible = "amlogic,meson-g12a-spicc";
+                               reg = <0x0 0x15000 0x0 0x44>;
                                interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>;
-                               clock-names = "spicc_clk";
-                               clocks = <&clkc CLKID_SPICC1_COMP>;
-                               clk_rate = <666666666>;
-                               device_id = <1>;
-                               enhance = <1>;
-                               ssctl = <0>;
-                               dma_tx_threshold = <3>;
-                               dma_num_per_read_burst = <13>;
-                               dma_auto_param = <1>;
-                               delay_control = <0x15>;
+                               clocks = <&clkc CLKID_SPICC1>,
+                                        <&clkc CLKID_SPICC1_COMP>;
+                               clock-names = "core", "comp";
                                #address-cells = <1>;
                                #size-cells = <0>;
                                status = "disabled";
@@ -2380,6 +2366,7 @@
                                 //"spi0_ss0_x",
                                 "spi0_clk_x";
                        function = "spi0";
+                       drive-strength = <1>;
                };
        };
 
@@ -2390,6 +2377,7 @@
                                        "spi0_ss0_c",
                                        "spi0_clk_c";
                        function = "spi0";
+                       drive-strength = <1>;
                };
        };
 
@@ -2400,6 +2388,7 @@
                                 //"spi1_ss0",
                                 "spi1_clk";
                        function = "spi1";
+                       drive-strength = <1>;
                };
        };
 

diff --git a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
index e788074..9206ffb 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
@@ -611,38 +611,26 @@
                        };
 
                        spicc0: spi@13000 {
-                               compatible = "amlogic, spicc";
-                               reg = <0x0 0x13000 0x0 0x40>;
+                               compatible = "amlogic,meson-g12b-spicc",
+                                            "amlogic,meson-g12a-spicc";
+                               reg = <0x0 0x13000 0x0 0x44>;
                                interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
-                               clock-names = "spicc_clk";
-                               clocks = <&clkc CLKID_SPICC0_COMP>;
-                               clk_rate = <666666666>;
-                               device_id = <0>;
-                               enhance = <1>;
-                               ssctl = <0>;
-                               dma_tx_threshold = <3>;
-                               dma_num_per_read_burst = <13>;
-                               dma_auto_param = <1>;
-                               delay_control = <0x15>;
+                               clocks = <&clkc CLKID_SPICC0>,
+                                        <&clkc CLKID_SPICC0_COMP>;
+                               clock-names = "core", "comp";
                                #address-cells = <1>;
                                #size-cells = <0>;
                                status = "disabled";
                        };
 
                        spicc1: spi@15000 {
-                               compatible = "amlogic, spicc";
-                               reg = <0x0 0x15000 0x0 0x40>;
+                               compatible = "amlogic,meson-g12b-spicc",
+                                            "amlogic,meson-g12a-spicc";
+                               reg = <0x0 0x15000 0x0 0x44>;
                                interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>;
-                               clock-names = "spicc_clk";
-                               clocks = <&clkc CLKID_SPICC1_COMP>;
-                               clk_rate = <666666666>;
-                               device_id = <1>;
-                               enhance = <1>;
-                               ssctl = <0>;
-                               dma_tx_threshold = <3>;
-                               dma_num_per_read_burst = <13>;
-                               dma_auto_param = <1>;
-                               delay_control = <0x15>;
+                               clocks = <&clkc CLKID_SPICC1>,
+                                        <&clkc CLKID_SPICC1_COMP>;
+                               clock-names = "core", "comp";
                                #address-cells = <1>;
                                #size-cells = <0>;
                                status = "disabled";
@@ -2364,6 +2352,7 @@
                                 //"spi0_ss0_x",
                                 "spi0_clk_x";
                        function = "spi0";
+                       drive-strength = <1>;
                };
        };
 
@@ -2374,6 +2363,7 @@
                                 //"spi1_ss0",
                                 "spi1_clk";
                        function = "spi1";
+                       drive-strength = <1>;
                };
        };
 

diff --git a/arch/arm64/boot/dts/amlogic/mesontxlx.dtsi b/arch/arm64/boot/dts/amlogic/mesontxlx.dtsi
index 248095c..9330b5a 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesontxlx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesontxlx.dtsi
@@ -711,24 +711,7 @@
                                status = "disabled";
                        };
 
-                       spicc0: spicc0 {
-                               compatible = "amlogic, spicc";
-                               reg = <0x0 0x13000 0x0 0x40>;
-                               clock-names = "spicc_clk";
-                               clocks = <&clkc CLKID_SPICC0>;
-                               device_id = <0>;
-                               enhance = <1>;
-                               ssctl = <0>;
-                               dma_tx_threshold = <3>;
-                               dma_num_per_read_burst = <13>;
-                               dma_auto_param = <1>;
-                               delay_control = <0x15>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               status = "disabled";
-                       };
-
-                       spicc_a: spi@13000 {
+                       spicc0: spi@13000 {
                                compatible = "amlogic,meson-txlx-spicc";
                                reg = <0x0 0x13000 0x0 0x3c>;
                                interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
@@ -739,10 +722,10 @@
                                status = "disabled";
                        };
 
-                       spicc_b: spi@15000 {
+                       spicc1: spi@15000 {
                                compatible = "amlogic,meson-txlx-spicc";
                                reg = <0x0 0x15000 0x0 0x3c>;
-                               interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clkc CLKID_SPICC1>;
                                clock-names = "core";
                                #address-cells = <1>;

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
index 3d1a6bb..7851cda 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
@@ -1511,8 +1511,7 @@
        status = "okay";
 };
 
-
-&spicc_a {
+&spicc0 {
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&spi_a_pins>;

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts
index 13bf556..1350c52 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts
@@ -1550,7 +1550,7 @@
 };
 
 
-&spicc_a {
+&spicc0 {
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&spi_a_pins>;

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
index 9749bc3..e167e8d 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
@@ -1574,18 +1574,9 @@
        status = "okay";
 };
 
-
-&spicc_a {
-       status = "disabled";
-       pinctrl-names = "default";
-       pinctrl-0 = <&spi_a_pins>;
-       cs-gpios = <&gpio GPIOZ_3 0>;
-};
-
 &spicc0 {
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&spi_a_pins>;
        cs-gpios = <&gpio GPIOZ_3 0>;
-       num_chipselect = <1>;
 };

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
index 7100486..aba7a47 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
@@ -1579,18 +1579,9 @@
        status = "okay";
 };
 
-
-&spicc_a {
-       status = "disabled";
-       pinctrl-names = "default";
-       pinctrl-0 = <&spi_a_pins>;
-       cs-gpios = <&gpio GPIOZ_3 0>;
-};
-
 &spicc0 {
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&spi_a_pins>;
        cs-gpios = <&gpio GPIOZ_3 0>;
-       num_chipselect = <1>;
 };

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
index 1e689dd..58af6de 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
@@ -1571,18 +1571,9 @@
        status = "okay";
 };
 
-
-&spicc_a {
-       status = "disabled";
-       pinctrl-names = "default";
-       pinctrl-0 = <&spi_a_pins>;
-       cs-gpios = <&gpio GPIOZ_3 0>;
-};
-
 &spicc0 {
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&spi_a_pins>;
        cs-gpios = <&gpio GPIOZ_3 0>;
-       num_chipselect = <1>;
 };