github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-23 22:14:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Amlogic ARM64 DT for v7.3:

Browse Source 
- Amlogic AXG fixups for PCIe and NAND
 - Overall indentation and whitespace fixups
 - Amlogic A9 Pinctrl & GPIO IRQ nodes
 - Clock measure nodes for Amlogic T7 & A1
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAmppuD4ACgkQd9zb2sjI
 SdGFPxAAwLi5kwLl7ID9WgjCZ/Qqb3XIyfrnFiBJTXydFAmdxqRvzI1d3P0gwukp
 GXRb+ZegfeqXVXIrUt3X95SPAwx6ajPF7uxAYopxanHPvnhEp7cPZihKoAuJSUHl
 nuntgyU8048//MLRGizXX1VPL7NilW+uIQAe7ut4AVIvDVzHoSP818Aek7GoyS6D
 k6+txNZ+gCDIr7RhCXlHXbw2GRNyvi5oguoniSXgy+PhNT3p9k+4Vy7VJSHxzScD
 ZKaO+qQHsqtmmLDLYuOVKFTCL2unGtIJNpLHDyG6bvhTlFdebYS7Y6XSB8am34KN
 pPukfCwAxAkmh0JoYTawwwGuh90roqesmyQhMCybs9c1JBMx8f50vrzUosvy65sc
 M42lBcDfEDVe5bT4H0y83WC2MmDb2gdvkNf4C+c3RQJINVSy67RhpbPOP9L6pptq
 3oWY1ZWrcWnpAZSEiWapkvqiHO7KnQw3UaUe+m5T/z/xiXKL212pXxc38O7bmfyC
 XZlcxtdwo42h6DpYV1sQPf/BbIA8Qr4r8RuE7X8qYkl9CKZvO7MP28TTDiuaUauJ
 zKOuSSu48qOmUc7LX0tt3P9OBaD7Mcwfqj7KFvgws+3yf5J+deLrW8TjaF6MyoIf
 bw0xUvX1+Co2mqRyHaF/CU+nGfPfxuH26nvZtcZmSMwnLC4KZPc=
 =q1K8
 -----END PGP SIGNATURE-----

Merge tag 'amlogic-arm64-dt-for-v7.3' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/dt

Amlogic ARM64 DT for v7.3:
- Amlogic AXG fixups for PCIe and NAND
- Overall indentation and whitespace fixups
- Amlogic A9 Pinctrl & GPIO IRQ nodes
- Clock measure nodes for Amlogic T7 & A1

* tag 'amlogic-arm64-dt-for-v7.3' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  arm64: dts: amlogic: meson-axg-s400: enable mipi_pcie_analog_dphy for PCIe
  arm64: dts: amlogic: meson-axg: Disable pcie_phy node by default
  arm64: dts: amlogic: meson-axg: Add missing nand_rb0 pin to nand_all_pins
  arm64: dts: amlogic: meson-axg: Disable nfc node by default
  arm64: dts: amlogic: Correct indentation and whitespace
  arm64: dts: amlogic: add some device nodes for A9
  arm64: dts: amlogic: t7: Add clk measure support
  arm64: dts: meson: a1: Add clk measure support

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
This commit is contained in:
Alexandre Belloni 2026-08-08 18:47:06 +02:00
commit 307b9caae6
8 changed files with 180 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
arch/arm64/boot/dts/amlogic/amlogic-a9.dtsi
View File

@ -6,6 +6,7 @@
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/amlogic,pinctrl.h>
/ {
interrupt-parent = <&gic>;
@ -97,6 +98,95 @@ soc {
#size-cells = <2>;
ranges;
apb: bus@fe000000 {
compatible = "simple-bus";
reg = <0x0 0xfe000000 0x0 0x480000>;
#address-cells = <2>;
#size-cells = <2>;
ranges = <0x0 0x0 0x0 0xfe000000 0x0 0x480000>;
periphs_pinctrl: pinctrl@4000 {
compatible = "amlogic,pinctrl-a9";
#address-cells = <2>;
#size-cells = <2>;
ranges = <0x0 0x0 0x0 0x4000 0x0 0x340>;
gpioz: gpio@c0 {
reg = <0 0xc0 0 0x20>, <0 0x18 0 0x8>;
reg-names = "gpio", "mux";
gpio-controller;
#gpio-cells = <2>;
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_Z<<8) 16>;
};
gpiox: gpio@100 {
reg = <0 0x100 0 0x24>, <0 0xc 0 0x8>;
reg-names = "gpio", "mux";
gpio-controller;
#gpio-cells = <2>;
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_X<<8) 18>;
};
gpioh: gpio@140 {
reg = <0 0x140 0 0x20>, <0 0x2c 0 0x4>;
reg-names = "gpio", "mux";
gpio-controller;
#gpio-cells = <2>;
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_H<<8) 8>;
};
gpiom: gpio@1a0 {
reg = <0 0x1a0 0 0x20>, <0 0x20 0 0x4>;
reg-names = "gpio", "mux";
gpio-controller;
#gpio-cells = <2>;
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_M<<8) 8>;
};
gpiob: gpio@240 {
reg = <0 0x240 0 0x20>, <0 0x0 0 0x8>;
reg-names = "gpio", "mux";
gpio-controller;
#gpio-cells = <2>;
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_B<<8) 14>;
};
gpioa: gpio@280 {
reg = <0 0x280 0 0x24>, <0 0x40 0 0xc>;
reg-names = "gpio", "mux";
gpio-controller;
#gpio-cells = <2>;
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_A<<8) 20>;
};
gpioy: gpio@2c0 {
reg = <0 0x2c0 0 0x20>, <0 0x30 0 0x8>;
reg-names = "gpio", "mux";
gpio-controller;
#gpio-cells = <2>;
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_Y<<8) 10>;
};
gpiocc: gpio@300 {
reg = <0 0x300 0 0x20>, <0 0x14 0 0x4>;
reg-names = "gpio", "mux";
gpio-controller;
#gpio-cells = <2>;
gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_CC<<8) 2>;
};
};
gpio_intc: interrupt-controller@4080 {
compatible = "amlogic,a9-gpio-intc",
"amlogic,meson-gpio-intc";
reg = <0x0 0x4080 0x0 0x20>;
interrupt-controller;
#interrupt-cells = <2>;
amlogic,channel-interrupts =
<10 11 12 13 14 15 16 17 18 19 20 21>;
};
};
gic: interrupt-controller@ff800000 {
compatible = "arm,gic-v3";
#interrupt-cells = <3>;
@ -114,6 +204,56 @@ aobus: bus@ffa00000 {
#size-cells = <2>;
ranges = <0x0 0x0 0x0 0xffa00000 0x0 0x100000>;
aobus_pinctrl: pinctrl@4000 {
compatible = "amlogic,pinctrl-a9";
#address-cells = <2>;
#size-cells = <2>;
ranges = <0x0 0x0 0x0 0x4000 0x0 0x0e0>;
gpioao: gpio@1c {
reg = <0 0x1c 0 0x20>, <0 0x0 0 0x8>;
reg-names = "gpio", "mux";
gpio-controller;
#gpio-cells = <2>;
gpio-ranges = <&aobus_pinctrl 0 (AMLOGIC_GPIO_AO<<8) 13>;
};
gpioc: gpio@3c {
reg = <0 0x3c 0 0x20>, <0 0x10 0 0x4>;
reg-names = "gpio", "mux";
gpio-controller;
#gpio-cells = <2>;
gpio-ranges = <&aobus_pinctrl 0 (AMLOGIC_GPIO_C<<8) 7>;
};
gpiod: gpio@5c {
reg = <0 0x5c 0 0x24>, <0 0x8 0 0x8>;
reg-names = "gpio", "mux";
gpio-controller;
#gpio-cells = <2>;
gpio-ranges = <&aobus_pinctrl 0 (AMLOGIC_GPIO_D<<8) 18>;
};
test_n: gpio@c0 {
reg = <0 0xc0 0 0x20>;
reg-names = "gpio";
gpio-controller;
#gpio-cells = <2>;
gpio-ranges = <&aobus_pinctrl 0 (AMLOGIC_GPIO_TEST_N<<8) 1>;
};
};
gpio_ao_intc: interrupt-controller@4080 {
compatible = "amlogic,a9-gpio-ao-intc",
"amlogic,meson-gpio-intc";
reg = <0x0 0x4080 0x0 0x34>;
interrupt-controller;
#interrupt-cells = <2>;
amlogic,channel-interrupts =
<384 385 386 387 388 389 390 391 392 393
394 395 396 397 398 399 400 401 402 403>;
};
uart_b: serial@1e000 {
compatible = "amlogic,a9-uart",
"amlogic,meson-s4-uart";

5
arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi
View File

@ -674,6 +674,11 @@ pwm_ao_gh: pwm@32000 {
status = "disabled";
};
clock-measurer@48000 {
compatible = "amlogic,t7-clk-measure";
reg = <0x0 0x48000 0x0 0x1c>;
};
pwm_ab: pwm@58000 {
compatible = "amlogic,t7-pwm", "amlogic,meson-s4-pwm";
reg = <0x0 0x58000 0x0 0x24>;

5
arch/arm64/boot/dts/amlogic/meson-a1.dtsi
View File

@ -576,6 +576,11 @@ saradc: adc@2c00 {
status = "disabled";
};
clock-measurer@3400 {
compatible = "amlogic,a1-clk-measure";
reg = <0x0 0x3400 0x0 0x1c>;
};
i2c1: i2c@5c00 {
compatible = "amlogic,meson-axg-i2c";
status = "disabled";

8
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
View File

@ -431,6 +431,10 @@ gpio_speaker: gpio-controller@1f {
};
};
&mipi_pcie_analog_dphy {
status = "okay";
};
&pdm {
pinctrl-0 = <&pdm_dclk_a14_pins>, <&pdm_din0_pins>,
<&pdm_din1_pins>, <&pdm_din2_pins>, <&pdm_din3_pins>;
@ -448,6 +452,10 @@ &pcieB {
status = "okay";
};
&pcie_phy {
status = "okay";
};
&pwm_ab {
status = "okay";
pinctrl-0 = <&pwm_a_x20_pins>;

5
arch/arm64/boot/dts/amlogic/meson-axg.dtsi
View File

@ -328,6 +328,7 @@ pcie_phy: phy@ff644000 {
phys = <&mipi_pcie_analog_dphy>;
phy-names = "analog";
#phy-cells = <0>;
status = "disabled";
};
pdm: audio-controller@ff632000 {
@ -481,7 +482,8 @@ mux {
"nand_ale",
"nand_cle",
"nand_wen_clk",
"nand_ren_wr";
"nand_ren_wr",
"nand_rb0";
function = "nand";
input-enable;
bias-pull-up;
@ -1999,6 +2001,7 @@ nfc: nand-controller@7800 {
clocks = <&clkc CLKID_SD_EMMC_C>,
<&clkc CLKID_FCLK_DIV2>;
clock-names = "core", "device";
status = "disabled";
};
usb2_phy1: phy@9020 {

32
arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
View File

@ -88,25 +88,25 @@ opp-1800000000 {
opp-microvolt = <831000>;
};
opp-1908000000 {
opp-hz = /bits/ 64 <1908000000>;
opp-microvolt = <861000>;
};
opp-1908000000 {
opp-hz = /bits/ 64 <1908000000>;
opp-microvolt = <861000>;
};
opp-2016000000 {
opp-hz = /bits/ 64 <2016000000>;
opp-microvolt = <911000>;
};
opp-2016000000 {
opp-hz = /bits/ 64 <2016000000>;
opp-microvolt = <911000>;
};
opp-2108000000 {
opp-hz = /bits/ 64 <2108000000>;
opp-microvolt = <951000>;
};
opp-2108000000 {
opp-hz = /bits/ 64 <2108000000>;
opp-microvolt = <951000>;
};
opp-2208000000 {
opp-hz = /bits/ 64 <2208000000>;
opp-microvolt = <1011000>;
};
opp-2208000000 {
opp-hz = /bits/ 64 <2208000000>;
opp-microvolt = <1011000>;
};
};
};

2
arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dts
View File

@ -64,7 +64,7 @@ &internal_phy {
};
&ir {
linux,rc-map-name = "rc-khamsin";
linux,rc-map-name = "rc-khamsin";
};
/* This is connected to the Bluetooth module: */

2
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
View File

@ -642,7 +642,7 @@ mux {
function = "eth_led";
};
};
pwm_a_pins: pwm_a {
mux {
groups = "pwm_a";