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

arm64: dts: update i2c device node name for all platforms

Browse Source 
PD#154260: arm64: dts: update i2c device node name for all platforms

This commit base on previous commit of i2c.

Change-Id: Ie5a3619db4739d7b9c9574f5628775b274681047
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
This commit is contained in:
Jian Hu
2017-11-21 19:49:28 +08:00
committed by Jianxin Pan
parent 071b97fd8a
commit b31f931bf6
15 changed files with 210 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -706,7 +706,7 @@
/* Audio Related start */
/* for spk board */
&i2c_b {
&i2c1 {
status = "okay";
//pinctrl-names="default";
//pinctrl-0=<&b_i2c_master>;
@@ -734,7 +734,7 @@
};
/* for mic board */
&i2c_ao {
&i2c_AO {
status = "okay";
pinctrl-names="default";
pinctrl-0=<&ao_i2c_master_pin2>;

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

@@ -700,7 +700,7 @@
};
/* for spk board */
&i2c_b {
&i2c1 {
status = "okay";
//pinctrl-names="default";
//pinctrl-0=<&b_i2c_master>;
@@ -728,7 +728,7 @@
};
/* for mic board */
&i2c_ao {
&i2c_AO {
status = "okay";
pinctrl-names="default";
pinctrl-0=<&ao_i2c_master_pin2>;

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

@@ -880,7 +880,7 @@
};
/* Audio Related start */
/* for spk board */
&i2c_b {
&i2c1 {
status = "okay";
//pinctrl-names="default";
//pinctrl-0=<&b_i2c_master>;
@@ -909,7 +909,7 @@
};
/* for mic board */
&i2c_ao {
&i2c_AO {
status = "okay";
pinctrl-names="default";
pinctrl-0=<&ao_i2c_master_pin2>;

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

@@ -880,7 +880,7 @@
};
/* Audio Related start */
/* for spk board */
&i2c_b {
&i2c1 {
status = "okay";
//pinctrl-names="default";
//pinctrl-0=<&b_i2c_master>;
@@ -909,7 +909,7 @@
};
/* for mic board */
&i2c_ao {
&i2c_AO {
status = "okay";
pinctrl-names="default";
pinctrl-0=<&ao_i2c_master_pin2>;

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

@@ -881,7 +881,7 @@
};
/* Audio Related start */
/* for spk board */
&i2c_b {
&i2c1 {
status = "okay";
//pinctrl-names="default";
//pinctrl-0=<&b_i2c_master>;
@@ -910,7 +910,7 @@
};
/* for mic board */
&i2c_ao {
&i2c_AO {
status = "okay";
pinctrl-names="default";
pinctrl-0=<&ao_i2c_master_pin2>;

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

@@ -882,7 +882,7 @@
};
/* Audio Related start */
/* for spk board */
&i2c_b {
&i2c1 {
status = "okay";
//pinctrl-names="default";
//pinctrl-0=<&b_i2c_master>;
@@ -911,7 +911,7 @@
};
/* for mic board */
&i2c_ao {
&i2c_AO {
status = "okay";
pinctrl-names="default";
pinctrl-0=<&ao_i2c_master_pin2>;

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

@@ -707,7 +707,7 @@
};
/* for spk board */
&i2c_b {
&i2c1 {
status = "okay";
//pinctrl-names="default";
//pinctrl-0=<&b_i2c_master>;
@@ -736,7 +736,7 @@
};
/* for mic board */
&i2c_ao {
&i2c_AO {
status = "okay";
pinctrl-names="default";
pinctrl-0=<&ao_i2c_master_pin2>;

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

@@ -705,7 +705,7 @@
};
/* for spk board */
&i2c_b {
&i2c1 {
status = "okay";
//pinctrl-names="default";
//pinctrl-0=<&b_i2c_master>;
@@ -734,7 +734,7 @@
};
/* for mic board */
&i2c_ao {
&i2c_AO {
status = "okay";
pinctrl-names="default";
pinctrl-0=<&ao_i2c_master_pin2>;

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

@@ -707,7 +707,7 @@
};
/* for spk board */
&i2c_b {
&i2c1 {
status = "okay";
//pinctrl-names="default";
//pinctrl-0=<&b_i2c_master>;
@@ -736,7 +736,7 @@
};
/* for mic board */
&i2c_ao {
&i2c_AO {
status = "okay";
pinctrl-names="default";
pinctrl-0=<&ao_i2c_master_pin2>;

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

@@ -852,7 +852,7 @@
};
};
&i2c_ao {
&i2c_AO {
status = "okay";
pca9557:pca9557@0x1f{
compatible = "nxp,pca9557";

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

@@ -940,7 +940,7 @@
};
};
&i2c_ao {
&i2c_AO {
status = "okay";
pca9557:pca9557@0x1f{
compatible = "nxp,pca9557";

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

@@ -1172,6 +1172,6 @@
&audio_data{
status = "okay";
};
&i2c_b {
&i2c1 {
status = "okay";
};

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

@@ -342,6 +342,58 @@
reg = <0x0 0x18004 0x0 0x4
0x0 0x1800c 0x0 0x4>;
};
/*i2c-A*/
i2c0: i2c@1f000 {
compatible = "amlogic,meson-txlx-i2c";
status = "disabled";
reg = <0x0 0x1f000 0x0 0x20>;
interrupts = <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 47 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
/*i2c-B*/
i2c1: i2c@1e000 {
compatible = "amlogic,meson-txlx-i2c";
status = "disabled";
reg = <0x0 0x1e000 0x0 0x20>;
interrupts = <GIC_SPI 214 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 48 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
/*i2c-C*/
i2c2: i2c@1d000 {
compatible = "amlogic,meson-txlx-i2c";
status = "disabled";
reg = <0x0 0x1d000 0x0 0x20>;
interrupts = <GIC_SPI 215 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 49 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
/*i2c-D*/
i2c3: i2c@1c000 {
compatible = "amlogic,meson-axg-i2c";
status = "disabled";
reg = <0x0 0x1c000 0x0 0x20>;
interrupts = <GIC_SPI 39 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 50 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
}; /* end of cbus */
aobus: aobus@ff800000 {
@@ -360,6 +412,17 @@
#clock-cells = <1>;
reg = <0x0 0x0 0x0 0x320>;
};
i2c_AO: i2c@5000 {
compatible = "amlogic,meson-txlx-i2c";
status = "disabled";
reg = <0x0 0x05000 0x0 0x20>;
interrupts = <GIC_SPI 195 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
};/* end of aobus */
periphs: periphs@ff634400 {
@@ -648,87 +711,6 @@
REMOTE_KEY(0xcd,121)>;
};
};
i2c_ao: i2c@ff805000{ /*I2C-AO*/
compatible = "amlogic, meson-i2c";
dev_name = "i2c-AO";
status = "disabled";
reg = <0x0 0xff805000 0x0 0x1d>;
device_id = <0>;
pinctrl-names="default";
pinctrl-0=<&ao_i2c_master>;
#address-cells = <1>;
#size-cells = <0>;
use_pio = <0>;
master_i2c_speed = <300000>;
clocks = <&clkc CLKID_AO_I2C>;
clock-names = "clk_i2c";
};
i2c_a: i2c@ffd1f000 { /*I2C-A*/
compatible = "amlogic, meson-i2c";
dev_name = "i2c-A";
status = "disabled";
reg = <0x0 0xffd1f000 0x0 0x20>;
device_id = <1>;
pinctrl-names="default";
pinctrl-0=<&a_i2c_master>;/*p200 i2c-A multiplex with usb PWR*/
#address-cells = <1>;
#size-cells = <0>;
use_pio = <0>;
master_i2c_speed = <300000>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
i2c_b: i2c@ffd1e000 { /*I2C-B*/
compatible = "amlogic, meson-i2c";
dev_name = "i2c-B";
status = "disabled";
reg = <0x0 0xffd1e000 0x0 0x20>;
device_id = <2>;
pinctrl-names="default";
pinctrl-0=<&b_i2c_master>;
#address-cells = <1>;
#size-cells = <0>;
use_pio = <0>;
master_i2c_speed = <300000>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
i2c_c: i2c@ffd1d000 { /*I2C-C*/
compatible = "amlogic, meson-i2c";
dev_name = "i2c-C";
status = "disabled";
reg = <0x0 0xffd1d000 0x0 0x20>;
device_id = <3>;
pinctrl-names="default";
pinctrl-0=<&c_i2c_master>;
#address-cells = <1>;
#size-cells = <0>;
use_pio = <0>;
master_i2c_speed = <300000>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
i2c_d: i2c@ffd1c000 { /*I2C-D*/
compatible = "amlogic, meson-i2c";
dev_name = "i2c-D";
status = "disabled";
reg = <0x0 0xffd1c000 0x0 0x20>;
device_id = <4>;
pinctrl-names="default";
pinctrl-0=<&d_i2c_master>;
#address-cells = <1>;
#size-cells = <0>;
use_pio = <0>;
master_i2c_speed = <300000>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
i2c_slave:i2c_slave@ff806000{
compatible = "amlogic, meson-i2c-slave";
status = "disabled";

139
arch/arm64/boot/dts/amlogic/mesongxl.dtsi
View File

@@ -357,82 +357,6 @@
pinctrl-0 = <&ao_b_uart_pins>;
};
i2c_ao: i2c@c8100500{ /*I2C-AO*/
compatible = "amlogic, meson-i2c";
dev_name = "i2c-AO";
status = "disabled";
reg = <0x0 0xc8100500 0x0 0x1d>;
device_id = <0>;
pinctrl-names="default";
pinctrl-0=<&ao_i2c_master>;
#address-cells = <1>;
#size-cells = <0>;
use_pio = <0>;
master_i2c_speed = <300000>;
clocks = <&clkc CLKID_AO_I2C>;
clock-names = "clk_i2c";
};
i2c_a: i2c@c1108500{ /*I2C-A*/
compatible = "amlogic, meson-i2c";
dev_name = "i2c-A";
status = "disabled";
reg = <0x0 0xc1108500 0x0 0x20>;
device_id = <1>;
pinctrl-names="default";
pinctrl-0=<&a_i2c_master>;
#address-cells = <1>;
#size-cells = <0>;
use_pio = <0>;
master_i2c_speed = <300000>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
i2c_b: i2c@c11087c0{ /*I2C-B*/
compatible = "amlogic, meson-i2c";
dev_name = "i2c-B";
status = "disabled";
reg = <0x0 0xc11087c0 0x0 0x20>;
device_id = <2>;
pinctrl-names="default";
pinctrl-0=<&b_i2c_master>;
#address-cells = <1>;
#size-cells = <0>;
use_pio = <0>;
master_i2c_speed = <300000>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
i2c_c: i2c@c11087e0{ /*I2C-C*/
compatible = "amlogic, meson-i2c";
dev_name = "i2c-C";
status = "disabled";
reg = <0x0 0xc11087e0 0x0 0x20>;
device_id = <3>;
pinctrl-names="default";
pinctrl-0=<&c_i2c_master>;
#address-cells = <1>;
#size-cells = <0>;
use_pio = <0>;
master_i2c_speed = <300000>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
i2c_d: i2c@c1108d20{ /*I2C-D*/
compatible = "amlogic, meson-i2c";
dev_name = "i2c-D";
status = "disabled";
reg = <0x0 0xc1108d20 0x0 0x20>;
device_id = <4>;
pinctrl-names="default";
pinctrl-0=<&d_i2c_master>;
#address-cells = <1>;
#size-cells = <0>;
use_pio = <0>;
master_i2c_speed = <300000>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
pinctrl_aobus: pinctrl@14 {
compatible = "amlogic,meson-gxl-aobus-pinctrl";
#address-cells = <2>;
@@ -501,6 +425,58 @@ i2c_ao: i2c@c8100500{ /*I2C-AO*/
reg = <0x0 0x875c 0x0 0x4
0x0 0x8764 0x0 0x4>;
};
/*i2c-A*/
i2c0: i2c@8500 {
compatible = "amlogic,meson-txlx-i2c";
status = "disabled";
reg = <0x0 0x8500 0x0 0x20>;
interrupts = <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 47 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
/*i2c-B*/
i2c1: i2c@87c0 {
compatible = "amlogic,meson-txlx-i2c";
status = "disabled";
reg = <0x0 0x87c0 0x0 0x20>;
interrupts = <GIC_SPI 214 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 48 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
/*i2c-C*/
i2c2: i2c@87e0 {
compatible = "amlogic,meson-txlx-i2c";
status = "disabled";
reg = <0x0 0x87e0 0x0 0x20>;
interrupts = <GIC_SPI 215 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 49 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
/*i2c-D*/
i2c3: i2c@8d20 {
compatible = "amlogic,meson-axg-i2c";
status = "disabled";
reg = <0x0 0x8d20 0x0 0x20>;
interrupts = <GIC_SPI 39 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 50 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
};
aobus: aobus@c8100000 {
@@ -513,6 +489,17 @@ i2c_ao: i2c@c8100500{ /*I2C-AO*/
cpu_version{
reg=<0x0 0x0220 0x0 0x4>;
};
i2c_AO: i2c@0100 {
compatible = "amlogic,meson-txlx-i2c";
status = "disabled";
reg = <0x0 0x0100 0x0 0x20>;
interrupts = <GIC_SPI 195 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
};
periphs: periphs@c8834000 {

139
arch/arm64/boot/dts/amlogic/mesongxm.dtsi
View File

@@ -440,82 +440,6 @@
pinctrl-0 = <&ao_b_uart_pins>;
};
i2c_ao: i2c@c8100500{ /*I2C-AO*/
compatible = "amlogic, meson-i2c";
dev_name = "i2c-AO";
status = "disabled";
reg = <0x0 0xc8100500 0x0 0x1d>;
device_id = <0>;
pinctrl-names="default";
pinctrl-0=<&ao_i2c_master>;
#address-cells = <1>;
#size-cells = <0>;
use_pio = <0>;
master_i2c_speed = <300000>;
clocks = <&clkc CLKID_AO_I2C>;
clock-names = "clk_i2c";
};
i2c_a: i2c@c1108500{ /*I2C-A*/
compatible = "amlogic, meson-i2c";
dev_name = "i2c-A";
status = "disabled";
reg = <0x0 0xc1108500 0x0 0x20>;
device_id = <1>;
pinctrl-names="default";
pinctrl-0=<&a_i2c_master>;
#address-cells = <1>;
#size-cells = <0>;
use_pio = <0>;
master_i2c_speed = <300000>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
i2c_b: i2c@c11087c0{ /*I2C-B*/
compatible = "amlogic, meson-i2c";
dev_name = "i2c-B";
status = "disabled";
reg = <0x0 0xc11087c0 0x0 0x20>;
device_id = <2>;
pinctrl-names="default";
pinctrl-0=<&b_i2c_master>;
#address-cells = <1>;
#size-cells = <0>;
use_pio = <0>;
master_i2c_speed = <300000>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
i2c_c: i2c@c11087e0{ /*I2C-C*/
compatible = "amlogic, meson-i2c";
dev_name = "i2c-C";
status = "disabled";
reg = <0x0 0xc11087e0 0x0 0x20>;
device_id = <3>;
pinctrl-names="default";
pinctrl-0=<&c_i2c_master>;
#address-cells = <1>;
#size-cells = <0>;
use_pio = <0>;
master_i2c_speed = <300000>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
i2c_d: i2c@c1108d20{ /*I2C-D*/
compatible = "amlogic, meson-i2c";
dev_name = "i2c-D";
status = "disabled";
reg = <0x0 0xc1108d20 0x0 0x20>;
device_id = <4>;
pinctrl-names="default";
pinctrl-0=<&d_i2c_master>;
#address-cells = <1>;
#size-cells = <0>;
use_pio = <0>;
master_i2c_speed = <300000>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
pinctrl_aobus: pinctrl@14 {
compatible = "amlogic,meson-gxl-aobus-pinctrl";
#address-cells = <2>;
@@ -584,6 +508,58 @@
reg = <0x0 0x875c 0x0 0x4
0x0 0x8764 0x0 0x4>;
};
/*i2c-A*/
i2c0: i2c@8500 {
compatible = "amlogic,meson-txlx-i2c";
status = "disabled";
reg = <0x0 0x8500 0x0 0x20>;
interrupts = <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 47 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
/*i2c-B*/
i2c1: i2c@87c0 {
compatible = "amlogic,meson-txlx-i2c";
status = "disabled";
reg = <0x0 0x87c0 0x0 0x20>;
interrupts = <GIC_SPI 214 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 48 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
/*i2c-C*/
i2c2: i2c@87e0 {
compatible = "amlogic,meson-txlx-i2c";
status = "disabled";
reg = <0x0 0x87e0 0x0 0x20>;
interrupts = <GIC_SPI 215 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 49 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
/*i2c-D*/
i2c3: i2c@8d20 {
compatible = "amlogic,meson-axg-i2c";
status = "disabled";
reg = <0x0 0x8d20 0x0 0x20>;
interrupts = <GIC_SPI 39 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 50 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
};
aobus: aobus@c8100000 {
@@ -596,6 +572,17 @@
cpu_version{
reg=<0x0 0x0220 0x0 0x4>;
};
i2c_AO: i2c@0100 {
compatible = "amlogic,meson-txlx-i2c";
status = "disabled";
reg = <0x0 0x0100 0x0 0x20>;
interrupts = <GIC_SPI 195 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&clkc CLKID_I2C>;
clock-names = "clk_i2c";
};
};
periphs: periphs@c8834000 {