Skip to content

L
linux
Commit 998a9c8a authored by Neil Armstrong's avatar Neil Armstrong Committed by Kevin Hilman
Browse files
Options

ARM64: dts: meson-gxbb: Move common nodes to meson-gx 

Move common nodes between GXBB and GXL in to the common GX dtsi.
Leave the clock attributes in the GXBB dtsi for now.
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
parent 70db166a
Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 136 deletions
arch/arm64/boot/dts/amlogic/meson-gx.dtsi
View file @ 998a9c8a
...@@ -129,6 +129,30 @@ xtal: xtal-clk { ...@@ -129,6 +129,30 @@ xtal: xtal-clk {
#clock-cells = <0>; #clock-cells = <0>;
}; };
firmware {
sm: secure-monitor {
compatible = "amlogic,meson-gx-sm", "amlogic,meson-gxbb-sm";
};
};
efuse: efuse {
compatible = "amlogic,meson-gx-efuse", "amlogic,meson-gxbb-efuse";
#address-cells = <1>;
#size-cells = <1>;
sn: sn@14 {
reg = <0x14 0x10>;
};
eth_mac: eth_mac@34 {
reg = <0x34 0x10>;
};
bid: bid@46 {
reg = <0x46 0x30>;
};
};
soc { soc {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <2>; #address-cells = <2>;
...@@ -142,6 +166,12 @@ cbus: cbus@c1100000 { ...@@ -142,6 +166,12 @@ cbus: cbus@c1100000 {
#size-cells = <2>; #size-cells = <2>;
ranges = <0x0 0x0 0x0 0xc1100000 0x0 0x100000>; ranges = <0x0 0x0 0x0 0xc1100000 0x0 0x100000>;
reset: reset-controller@4404 {
compatible = "amlogic,meson-gx-reset", "amlogic,meson-gxbb-reset";
reg = <0x0 0x04404 0x0 0x20>;
#reset-cells = <1>;
};
uart_A: serial@84c0 { uart_A: serial@84c0 {
compatible = "amlogic,meson-uart"; compatible = "amlogic,meson-uart";
reg = <0x0 0x84c0 0x0 0x14>; reg = <0x0 0x84c0 0x0 0x14>;
...@@ -149,6 +179,76 @@ uart_A: serial@84c0 { ...@@ -149,6 +179,76 @@ uart_A: serial@84c0 {
clocks = <&xtal>; clocks = <&xtal>;
status = "disabled"; status = "disabled";
}; };
uart_B: serial@84dc {
compatible = "amlogic,meson-uart";
reg = <0x0 0x84dc 0x0 0x14>;
interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
clocks = <&xtal>;
status = "disabled";
};
i2c_A: i2c@8500 {
compatible = "amlogic,meson-gxbb-i2c";
reg = <0x0 0x08500 0x0 0x20>;
interrupts = <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
pwm_ab: pwm@8550 {
compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm";
reg = <0x0 0x08550 0x0 0x10>;
#pwm-cells = <3>;
status = "disabled";
};
pwm_cd: pwm@8650 {
compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm";
reg = <0x0 0x08650 0x0 0x10>;
#pwm-cells = <3>;
status = "disabled";
};
pwm_ef: pwm@86c0 {
compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm";
reg = <0x0 0x086c0 0x0 0x10>;
#pwm-cells = <3>;
status = "disabled";
};
uart_C: serial@8700 {
compatible = "amlogic,meson-uart";
reg = <0x0 0x8700 0x0 0x14>;
interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;
clocks = <&xtal>;
status = "disabled";
};
i2c_B: i2c@87c0 {
compatible = "amlogic,meson-gxbb-i2c";
reg = <0x0 0x087c0 0x0 0x20>;
interrupts = <GIC_SPI 214 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
i2c_C: i2c@87e0 {
compatible = "amlogic,meson-gxbb-i2c";
reg = <0x0 0x087e0 0x0 0x20>;
interrupts = <GIC_SPI 215 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
watchdog@98d0 {
compatible = "amlogic,meson-gx-wdt", "amlogic,meson-gxbb-wdt";
reg = <0x0 0x098d0 0x0 0x10>;
clocks = <&xtal>;
};
}; };
gic: interrupt-controller@c4301000 { gic: interrupt-controller@c4301000 {
...@@ -178,6 +278,13 @@ uart_AO: serial@4c0 { ...@@ -178,6 +278,13 @@ uart_AO: serial@4c0 {
clocks = <&xtal>; clocks = <&xtal>;
status = "disabled"; status = "disabled";
}; };
ir: ir@580 {
compatible = "amlogic,meson-gxbb-ir";
reg = <0x0 0x00580 0x0 0x40>;
interrupts = <GIC_SPI 196 IRQ_TYPE_EDGE_RISING>;
status = "disabled";
};
}; };
periphs: periphs@c8834000 { periphs: periphs@c8834000 {
...@@ -186,6 +293,11 @@ periphs: periphs@c8834000 { ...@@ -186,6 +293,11 @@ periphs: periphs@c8834000 {
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
ranges = <0x0 0x0 0x0 0xc8834000 0x0 0x2000>; ranges = <0x0 0x0 0x0 0xc8834000 0x0 0x2000>;
rng {
compatible = "amlogic,meson-rng";
reg = <0x0 0x0 0x0 0x4>;
};
}; };
...@@ -195,6 +307,25 @@ hiubus: hiubus@c883c000 { ...@@ -195,6 +307,25 @@ hiubus: hiubus@c883c000 {
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
ranges = <0x0 0x0 0x0 0xc883c000 0x0 0x2000>; ranges = <0x0 0x0 0x0 0xc883c000 0x0 0x2000>;
mailbox: mailbox@404 {
compatible = "amlogic,meson-gx-mhu", "amlogic,meson-gxbb-mhu";
reg = <0 0x404 0 0x4c>;
interrupts = <0 208 IRQ_TYPE_EDGE_RISING>,
<0 209 IRQ_TYPE_EDGE_RISING>,
<0 210 IRQ_TYPE_EDGE_RISING>;
#mbox-cells = <1>;
};
};
ethmac: ethernet@c9410000 {
compatible = "amlogic,meson-gx-dwmac", "amlogic,meson-gxbb-dwmac", "snps,dwmac";
reg = <0x0 0xc9410000 0x0 0x10000
0x0 0xc8834540 0x0 0x4>;
interrupts = <0 8 1>;
interrupt-names = "macirq";
phy-mode = "rgmii";
status = "disabled";
}; };
apb: apb@d0000000 { apb: apb@d0000000 {
......
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
View file @ 998a9c8a
...@@ -50,30 +50,6 @@ ...@@ -50,30 +50,6 @@
/ { / {
compatible = "amlogic,meson-gxbb"; compatible = "amlogic,meson-gxbb";
firmware {
sm: secure-monitor {
compatible = "amlogic,meson-gxbb-sm";
};
};
efuse: efuse {
compatible = "amlogic,meson-gxbb-efuse";
#address-cells = <1>;
#size-cells = <1>;
sn: sn@14 {
reg = <0x14 0x10>;
};
eth_mac: eth_mac@34 {
reg = <0x34 0x10>;
};
bid: bid@46 {
reg = <0x46 0x30>;
};
};
scpi { scpi {
compatible = "amlogic,meson-gxbb-scpi"; compatible = "amlogic,meson-gxbb-scpi";
mboxes = <&mailbox 1 &mailbox 2>; mboxes = <&mailbox 1 &mailbox 2>;
...@@ -158,20 +134,6 @@ usb1: usb@c9100000 { ...@@ -158,20 +134,6 @@ usb1: usb@c9100000 {
dr_mode = "host"; dr_mode = "host";
status = "disabled"; status = "disabled";
}; };
ethmac: ethernet@c9410000 {
compatible = "amlogic,meson-gxbb-dwmac", "snps,dwmac";
reg = <0x0 0xc9410000 0x0 0x10000
0x0 0xc8834540 0x0 0x4>;
interrupts = <0 8 1>;
interrupt-names = "macirq";
clocks = <&clkc CLKID_ETH>,
<&clkc CLKID_FCLK_DIV2>,
<&clkc CLKID_MPLL2>;
clock-names = "stmmaceth", "clkin0", "clkin1";
phy-mode = "rgmii";
status = "disabled";
};
}; };
}; };
...@@ -192,55 +154,6 @@ &cpu3 { ...@@ -192,55 +154,6 @@ &cpu3 {
}; };
&cbus { &cbus {
reset: reset-controller@4404 {
compatible = "amlogic,meson-gxbb-reset";
reg = <0x0 0x04404 0x0 0x20>;
#reset-cells = <1>;
};
uart_B: serial@84dc {
compatible = "amlogic,meson-uart";
reg = <0x0 0x84dc 0x0 0x14>;
interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
clocks = <&xtal>;
status = "disabled";
};
pwm_ab: pwm@8550 {
compatible = "amlogic,meson-gxbb-pwm";
reg = <0x0 0x08550 0x0 0x10>;
#pwm-cells = <3>;
status = "disabled";
};
pwm_cd: pwm@8650 {
compatible = "amlogic,meson-gxbb-pwm";
reg = <0x0 0x08650 0x0 0x10>;
#pwm-cells = <3>;
status = "disabled";
};
pwm_ef: pwm@86c0 {
compatible = "amlogic,meson-gxbb-pwm";
reg = <0x0 0x086c0 0x0 0x10>;
#pwm-cells = <3>;
status = "disabled";
};
uart_C: serial@8700 {
compatible = "amlogic,meson-uart";
reg = <0x0 0x8700 0x0 0x14>;
interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;
clocks = <&xtal>;
status = "disabled";
};
watchdog@98d0 {
compatible = "amlogic,meson-gxbb-wdt";
reg = <0x0 0x098d0 0x0 0x10>;
clocks = <&xtal>;
};
spifc: spi@8c80 { spifc: spi@8c80 {
compatible = "amlogic,meson-gxbb-spifc"; compatible = "amlogic,meson-gxbb-spifc";
reg = <0x0 0x08c80 0x0 0x80>; reg = <0x0 0x08c80 0x0 0x80>;
...@@ -249,36 +162,13 @@ spifc: spi@8c80 { ...@@ -249,36 +162,13 @@ spifc: spi@8c80 {
clocks = <&clkc CLKID_SPI>; clocks = <&clkc CLKID_SPI>;
status = "disabled"; status = "disabled";
}; };
};
i2c_A: i2c@8500 { &ethmac {
compatible = "amlogic,meson-gxbb-i2c"; clocks = <&clkc CLKID_ETH>,
reg = <0x0 0x08500 0x0 0x20>; <&clkc CLKID_FCLK_DIV2>,
interrupts = <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>; <&clkc CLKID_MPLL2>;
clocks = <&clkc CLKID_I2C>; clock-names = "stmmaceth", "clkin0", "clkin1";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
i2c_B: i2c@87c0 {
compatible = "amlogic,meson-gxbb-i2c";
reg = <0x0 0x087c0 0x0 0x20>;
interrupts = <GIC_SPI 214 IRQ_TYPE_EDGE_RISING>;
clocks = <&clkc CLKID_I2C>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
i2c_C: i2c@87e0 {
compatible = "amlogic,meson-gxbb-i2c";
reg = <0x0 0x087e0 0x0 0x20>;
interrupts = <GIC_SPI 215 IRQ_TYPE_EDGE_RISING>;
clocks = <&clkc CLKID_I2C>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
}; };
&aobus { &aobus {
...@@ -355,13 +245,6 @@ clkc_AO: clock-controller@040 { ...@@ -355,13 +245,6 @@ clkc_AO: clock-controller@040 {
#reset-cells = <1>; #reset-cells = <1>;
}; };
ir: ir@580 {
compatible = "amlogic,meson-gxbb-ir";
reg = <0x0 0x00580 0x0 0x40>;
interrupts = <GIC_SPI 196 IRQ_TYPE_EDGE_RISING>;
status = "disabled";
};
pwm_ab_AO: pwm@550 { pwm_ab_AO: pwm@550 {
compatible = "amlogic,meson-gxbb-pwm"; compatible = "amlogic,meson-gxbb-pwm";
reg = <0x0 0x0550 0x0 0x10>; reg = <0x0 0x0550 0x0 0x10>;
...@@ -381,11 +264,6 @@ i2c_AO: i2c@500 { ...@@ -381,11 +264,6 @@ i2c_AO: i2c@500 {
}; };
&periphs { &periphs {
rng {
compatible = "amlogic,meson-rng";
reg = <0x0 0x0 0x0 0x4>;
};
pinctrl_periphs: pinctrl@4b0 { pinctrl_periphs: pinctrl@4b0 {
compatible = "amlogic,meson-gxbb-periphs-pinctrl"; compatible = "amlogic,meson-gxbb-periphs-pinctrl";
#address-cells = <2>; #address-cells = <2>;
...@@ -593,15 +471,18 @@ clkc: clock-controller@0 { ...@@ -593,15 +471,18 @@ clkc: clock-controller@0 {
#clock-cells = <1>; #clock-cells = <1>;
reg = <0x0 0x0 0x0 0x3db>; reg = <0x0 0x0 0x0 0x3db>;
}; };
};
mailbox: mailbox@404 { &i2c_A {
compatible = "amlogic,meson-gxbb-mhu"; clocks = <&clkc CLKID_I2C>;
reg = <0 0x404 0 0x4c>; };
interrupts = <0 208 IRQ_TYPE_EDGE_RISING>,
<0 209 IRQ_TYPE_EDGE_RISING>, &i2c_B {
<0 210 IRQ_TYPE_EDGE_RISING>; clocks = <&clkc CLKID_I2C>;
#mbox-cells = <1>; };
};
&i2c_C {
clocks = <&clkc CLKID_I2C>;
}; };
&sd_emmc_a { &sd_emmc_a {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7