shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Sunny Luo
2018-05-31 14:12:04 +08:00
committed by Yixun Lan
parent 59bc6ce4ed
commit d40f0ec497
23 changed files with 81 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts
View File

@@ -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{

19
arch/arm64/boot/dts/amlogic/axg_a113x_skt.dts
View File

@@ -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";

19
arch/arm64/boot/dts/amlogic/axg_pxp.dts
View File

@@ -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";

19
arch/arm64/boot/dts/amlogic/axg_s400.dts
View File

@@ -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";

18
arch/arm64/boot/dts/amlogic/axg_s400_v03.dts
View File

@@ -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";

18
arch/arm64/boot/dts/amlogic/axg_s400emmc.dts
View File

@@ -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";

18
arch/arm64/boot/dts/amlogic/axg_s400emmc_512m.dts
View File

@@ -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";

18
arch/arm64/boot/dts/amlogic/axg_s400emmc_v03.dts
View File

@@ -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";

19
arch/arm64/boot/dts/amlogic/axg_s420.dts
View File

@@ -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";

19
arch/arm64/boot/dts/amlogic/axg_s420_128m.dts
View File

@@ -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";

19
arch/arm64/boot/dts/amlogic/axg_s420_v03.dts
View File

@@ -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";

2
arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts
View File

@@ -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 {

4
arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts
View File

@@ -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 {

6
arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
View File

@@ -1279,3 +1279,9 @@
status = "okay";
};
&spicc1 {
status = "disabled";
pinctrl-names = "default";
pinctrl-0 = <&spicc1_pins>;
cs-gpios = <&gpio GPIOH_6 0>;
};

87
arch/arm64/boot/dts/amlogic/mesonaxg.dtsi
View File

@@ -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";
};
};

37
arch/arm64/boot/dts/amlogic/mesong12a.dtsi
View File

@@ -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>;
};
};

38
arch/arm64/boot/dts/amlogic/mesong12b.dtsi
View File

@@ -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>;
};
};

23
arch/arm64/boot/dts/amlogic/mesontxlx.dtsi
View File

@@ -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>;

3
arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
View File

@@ -1511,8 +1511,7 @@
status = "okay";
};
&spicc_a {
&spicc0 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&spi_a_pins>;

2
arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts
View File

@@ -1550,7 +1550,7 @@
};
&spicc_a {
&spicc0 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&spi_a_pins>;

9
arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
View File

@@ -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>;
};

9
arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
View File

@@ -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>;
};

9
arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
View File

@@ -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>;
};