ARM: dts: aspeed: Move pinctrl subnodes to improve readability
Moving the subnodes out of the pinctrl node declaration to a reference allows easier access to the remaining parts of the devicetree. Signed-off-by: Andrew Jeffery <andrew@aj.id.au> Reviewed-by: Xo Wang <xow@google.com> Acked-by: Andrew Jeffery <andrew@aj.id.au> Signed-off-by: Joel Stanley <joel@jms.id.au>
This commit is contained in:
Andrew Jeffery
Joel Stanley
Родитель
e19b205be4
Коммит
cd7df3f7ad
|
|
@ -126,7 +126,120 @@
|
|||
|
||||
pinctrl: pinctrl {
|
||||
compatible = "aspeed,g4-pinctrl";
|
||||
};
|
||||
};
|
||||
|
||||
sram@1e720000 {
|
||||
compatible = "mmio-sram";
|
||||
reg = <0x1e720000 0x8000>; // 32K
|
||||
};
|
||||
|
||||
gpio: gpio@1e780000 {
|
||||
#gpio-cells = <2>;
|
||||
gpio-controller;
|
||||
compatible = "aspeed,ast2400-gpio";
|
||||
reg = <0x1e780000 0x1000>;
|
||||
interrupts = <20>;
|
||||
gpio-ranges = <&pinctrl 0 0 220>;
|
||||
interrupt-controller;
|
||||
};
|
||||
|
||||
timer: timer@1e782000 {
|
||||
/* This timer is a Faraday FTTMR010 derivative */
|
||||
compatible = "aspeed,ast2400-timer";
|
||||
reg = <0x1e782000 0x90>;
|
||||
interrupts = <16 17 18 35 36 37 38 39>;
|
||||
clocks = <&clk_apb>;
|
||||
clock-names = "PCLK";
|
||||
};
|
||||
|
||||
wdt1: wdt@1e785000 {
|
||||
compatible = "aspeed,ast2400-wdt";
|
||||
reg = <0x1e785000 0x1c>;
|
||||
interrupts = <27>;
|
||||
};
|
||||
|
||||
wdt2: wdt@1e785020 {
|
||||
compatible = "aspeed,ast2400-wdt";
|
||||
reg = <0x1e785020 0x1c>;
|
||||
interrupts = <27>;
|
||||
clocks = <&clk_apb>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart1: serial@1e783000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e783000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <9>;
|
||||
clocks = <&clk_uart>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart2: serial@1e78d000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e78d000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <32>;
|
||||
clocks = <&clk_uart>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart3: serial@1e78e000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e78e000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <33>;
|
||||
clocks = <&clk_uart>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart4: serial@1e78f000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e78f000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <34>;
|
||||
clocks = <&clk_uart>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart5: serial@1e784000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e784000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <10>;
|
||||
clocks = <&clk_uart>;
|
||||
current-speed = <38400>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart6: serial@1e787000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e787000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <10>;
|
||||
clocks = <&clk_uart>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
adc: adc@1e6e9000 {
|
||||
compatible = "aspeed,ast2400-adc";
|
||||
reg = <0x1e6e9000 0xb0>;
|
||||
clocks = <&clk_apb>;
|
||||
#io-channel-cells = <1>;
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&pinctrl {
|
||||
pinctrl_acpi_default: acpi_default {
|
||||
function = "ACPI";
|
||||
groups = "ACPI";
|
||||
|
|
@ -866,116 +979,4 @@
|
|||
function = "WDTRST2";
|
||||
groups = "WDTRST2";
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
sram@1e720000 {
|
||||
compatible = "mmio-sram";
|
||||
reg = <0x1e720000 0x8000>; // 32K
|
||||
};
|
||||
|
||||
gpio: gpio@1e780000 {
|
||||
#gpio-cells = <2>;
|
||||
gpio-controller;
|
||||
compatible = "aspeed,ast2400-gpio";
|
||||
reg = <0x1e780000 0x1000>;
|
||||
interrupts = <20>;
|
||||
gpio-ranges = <&pinctrl 0 0 220>;
|
||||
interrupt-controller;
|
||||
};
|
||||
|
||||
timer: timer@1e782000 {
|
||||
/* This timer is a Faraday FTTMR010 derivative */
|
||||
compatible = "aspeed,ast2400-timer";
|
||||
reg = <0x1e782000 0x90>;
|
||||
interrupts = <16 17 18 35 36 37 38 39>;
|
||||
clocks = <&clk_apb>;
|
||||
clock-names = "PCLK";
|
||||
};
|
||||
|
||||
wdt1: wdt@1e785000 {
|
||||
compatible = "aspeed,ast2400-wdt";
|
||||
reg = <0x1e785000 0x1c>;
|
||||
interrupts = <27>;
|
||||
};
|
||||
|
||||
wdt2: wdt@1e785020 {
|
||||
compatible = "aspeed,ast2400-wdt";
|
||||
reg = <0x1e785020 0x1c>;
|
||||
interrupts = <27>;
|
||||
clocks = <&clk_apb>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart1: serial@1e783000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e783000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <9>;
|
||||
clocks = <&clk_uart>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart2: serial@1e78d000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e78d000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <32>;
|
||||
clocks = <&clk_uart>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart3: serial@1e78e000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e78e000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <33>;
|
||||
clocks = <&clk_uart>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart4: serial@1e78f000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e78f000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <34>;
|
||||
clocks = <&clk_uart>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart5: serial@1e784000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e784000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <10>;
|
||||
clocks = <&clk_uart>;
|
||||
current-speed = <38400>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart6: serial@1e787000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e787000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <10>;
|
||||
clocks = <&clk_uart>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
adc: adc@1e6e9000 {
|
||||
compatible = "aspeed,ast2400-adc";
|
||||
reg = <0x1e6e9000 0xb0>;
|
||||
clocks = <&clk_apb>;
|
||||
#io-channel-cells = <1>;
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -163,6 +163,163 @@
|
|||
compatible = "aspeed,g5-pinctrl";
|
||||
aspeed,external-nodes = <&gfx &lhc>;
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
gfx: display@1e6e6000 {
|
||||
compatible = "aspeed,ast2500-gfx", "syscon";
|
||||
reg = <0x1e6e6000 0x1000>;
|
||||
reg-io-width = <4>;
|
||||
};
|
||||
|
||||
sram@1e720000 {
|
||||
compatible = "mmio-sram";
|
||||
reg = <0x1e720000 0x9000>; // 36K
|
||||
};
|
||||
|
||||
gpio: gpio@1e780000 {
|
||||
#gpio-cells = <2>;
|
||||
gpio-controller;
|
||||
compatible = "aspeed,ast2500-gpio";
|
||||
reg = <0x1e780000 0x1000>;
|
||||
interrupts = <20>;
|
||||
gpio-ranges = <&pinctrl 0 0 220>;
|
||||
interrupt-controller;
|
||||
};
|
||||
|
||||
timer: timer@1e782000 {
|
||||
/* This timer is a Faraday FTTMR010 derivative */
|
||||
compatible = "aspeed,ast2400-timer";
|
||||
reg = <0x1e782000 0x90>;
|
||||
interrupts = <16 17 18 35 36 37 38 39>;
|
||||
clocks = <&clk_apb>;
|
||||
clock-names = "PCLK";
|
||||
};
|
||||
|
||||
|
||||
wdt1: wdt@1e785000 {
|
||||
compatible = "aspeed,ast2500-wdt";
|
||||
reg = <0x1e785000 0x20>;
|
||||
interrupts = <27>;
|
||||
};
|
||||
|
||||
wdt2: wdt@1e785020 {
|
||||
compatible = "aspeed,ast2500-wdt";
|
||||
reg = <0x1e785020 0x20>;
|
||||
interrupts = <27>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
wdt3: wdt@1e785040 {
|
||||
compatible = "aspeed,ast2500-wdt";
|
||||
reg = <0x1e785040 0x20>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart1: serial@1e783000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e783000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <9>;
|
||||
clocks = <&clk_uart>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
lpc: lpc@1e789000 {
|
||||
compatible = "aspeed,ast2500-lpc", "simple-mfd";
|
||||
reg = <0x1e789000 0x1000>;
|
||||
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
ranges = <0 0x1e789000 0x1000>;
|
||||
|
||||
lpc_bmc: lpc-bmc@0 {
|
||||
compatible = "aspeed,ast2500-lpc-bmc";
|
||||
reg = <0x0 0x80>;
|
||||
};
|
||||
|
||||
lpc_host: lpc-host@80 {
|
||||
compatible = "aspeed,ast2500-lpc-host", "simple-mfd", "syscon";
|
||||
reg = <0x80 0x1e0>;
|
||||
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
ranges = <0 0x80 0x1e0>;
|
||||
|
||||
reg-io-width = <4>;
|
||||
|
||||
lhc: lhc@20 {
|
||||
compatible = "aspeed,ast2500-lhc";
|
||||
reg = <0x20 0x24 0x48 0x8>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
uart2: serial@1e78d000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e78d000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <32>;
|
||||
clocks = <&clk_uart>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart3: serial@1e78e000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e78e000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <33>;
|
||||
clocks = <&clk_uart>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart4: serial@1e78f000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e78f000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <34>;
|
||||
clocks = <&clk_uart>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart5: serial@1e784000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e784000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <10>;
|
||||
clocks = <&clk_uart>;
|
||||
current-speed = <38400>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart6: serial@1e787000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e787000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <10>;
|
||||
clocks = <&clk_uart>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
adc: adc@1e6e9000 {
|
||||
compatible = "aspeed,ast2500-adc";
|
||||
reg = <0x1e6e9000 0xb0>;
|
||||
clocks = <&clk_apb>;
|
||||
#io-channel-cells = <1>;
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&pinctrl {
|
||||
pinctrl_acpi_default: acpi_default {
|
||||
function = "ACPI";
|
||||
groups = "ACPI";
|
||||
|
|
@ -382,6 +539,7 @@
|
|||
function = "LAD0";
|
||||
groups = "LAD0";
|
||||
};
|
||||
|
||||
pinctrl_lad1_default: lad1_default {
|
||||
function = "LAD1";
|
||||
groups = "LAD1";
|
||||
|
|
@ -966,159 +1124,4 @@
|
|||
function = "WDTRST2";
|
||||
groups = "WDTRST2";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
gfx: display@1e6e6000 {
|
||||
compatible = "aspeed,ast2500-gfx", "syscon";
|
||||
reg = <0x1e6e6000 0x1000>;
|
||||
reg-io-width = <4>;
|
||||
};
|
||||
|
||||
sram@1e720000 {
|
||||
compatible = "mmio-sram";
|
||||
reg = <0x1e720000 0x9000>; // 36K
|
||||
};
|
||||
|
||||
gpio: gpio@1e780000 {
|
||||
#gpio-cells = <2>;
|
||||
gpio-controller;
|
||||
compatible = "aspeed,ast2500-gpio";
|
||||
reg = <0x1e780000 0x1000>;
|
||||
interrupts = <20>;
|
||||
gpio-ranges = <&pinctrl 0 0 220>;
|
||||
interrupt-controller;
|
||||
};
|
||||
|
||||
timer: timer@1e782000 {
|
||||
/* This timer is a Faraday FTTMR010 derivative */
|
||||
compatible = "aspeed,ast2400-timer";
|
||||
reg = <0x1e782000 0x90>;
|
||||
interrupts = <16 17 18 35 36 37 38 39>;
|
||||
clocks = <&clk_apb>;
|
||||
clock-names = "PCLK";
|
||||
};
|
||||
|
||||
|
||||
wdt1: wdt@1e785000 {
|
||||
compatible = "aspeed,ast2500-wdt";
|
||||
reg = <0x1e785000 0x20>;
|
||||
interrupts = <27>;
|
||||
};
|
||||
|
||||
wdt2: wdt@1e785020 {
|
||||
compatible = "aspeed,ast2500-wdt";
|
||||
reg = <0x1e785020 0x20>;
|
||||
interrupts = <27>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
wdt3: wdt@1e785040 {
|
||||
compatible = "aspeed,ast2500-wdt";
|
||||
reg = <0x1e785040 0x20>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart1: serial@1e783000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e783000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <9>;
|
||||
clocks = <&clk_uart>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
lpc: lpc@1e789000 {
|
||||
compatible = "aspeed,ast2500-lpc", "simple-mfd";
|
||||
reg = <0x1e789000 0x1000>;
|
||||
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
ranges = <0 0x1e789000 0x1000>;
|
||||
|
||||
lpc_bmc: lpc-bmc@0 {
|
||||
compatible = "aspeed,ast2500-lpc-bmc";
|
||||
reg = <0x0 0x80>;
|
||||
};
|
||||
|
||||
lpc_host: lpc-host@80 {
|
||||
compatible = "aspeed,ast2500-lpc-host", "simple-mfd", "syscon";
|
||||
reg = <0x80 0x1e0>;
|
||||
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
ranges = <0 0x80 0x1e0>;
|
||||
|
||||
reg-io-width = <4>;
|
||||
|
||||
lhc: lhc@20 {
|
||||
compatible = "aspeed,ast2500-lhc";
|
||||
reg = <0x20 0x24 0x48 0x8>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
uart2: serial@1e78d000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e78d000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <32>;
|
||||
clocks = <&clk_uart>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart3: serial@1e78e000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e78e000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <33>;
|
||||
clocks = <&clk_uart>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart4: serial@1e78f000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e78f000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <34>;
|
||||
clocks = <&clk_uart>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart5: serial@1e784000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e784000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <10>;
|
||||
clocks = <&clk_uart>;
|
||||
current-speed = <38400>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart6: serial@1e787000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x1e787000 0x1000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <10>;
|
||||
clocks = <&clk_uart>;
|
||||
no-loopback-test;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
adc: adc@1e6e9000 {
|
||||
compatible = "aspeed,ast2500-adc";
|
||||
reg = <0x1e6e9000 0xb0>;
|
||||
clocks = <&clk_apb>;
|
||||
#io-channel-cells = <1>;
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче