diff options
| author | Neil Armstrong <neil.armstrong@linaro.org> | 2026-07-20 14:31:18 +0200 |
|---|---|---|
| committer | Neil Armstrong <neil.armstrong@linaro.org> | 2026-07-20 14:31:18 +0200 |
| commit | 544455a3a844edd6107b15cd0ab0b657399f2d49 (patch) | |
| tree | 9a9d5156801ed054f5a106b3c0f94acae2efca33 | |
| parent | 4336e970ec6890fbd424128c352564a9c1dd514a (diff) | |
| parent | 7f1d0cc86cb70fa550163b6f70fd1d484c03218e (diff) | |
| download | linux-next-544455a3a844edd6107b15cd0ab0b657399f2d49.tar.gz linux-next-544455a3a844edd6107b15cd0ab0b657399f2d49.zip | |
Merge branch 'v7.3/arm64-dt' into for-next
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 8 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi | 38 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dts | 2 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 2 |
5 files changed, 33 insertions, 22 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts index 285c6ac1dd61..4f13e2b041e1 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts @@ -431,6 +431,10 @@ }; }; +&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 @@ status = "okay"; }; +&pcie_phy { + status = "okay"; +}; + &pwm_ab { status = "okay"; pinctrl-0 = <&pwm_a_x20_pins>; diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index f1f53fd98ae2..5b8ef98f6d03 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -328,6 +328,7 @@ phys = <&mipi_pcie_analog_dphy>; phy-names = "analog"; #phy-cells = <0>; + status = "disabled"; }; pdm: audio-controller@ff632000 { @@ -481,7 +482,8 @@ "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 @@ clocks = <&clkc CLKID_SD_EMMC_C>, <&clkc CLKID_FCLK_DIV2>; clock-names = "core", "device"; + status = "disabled"; }; usb2_phy1: phy@9020 { diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi index f15baa708b36..8254e51d5e27 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi @@ -88,25 +88,25 @@ opp-microvolt = <831000>; }; - opp-1908000000 { - opp-hz = /bits/ 64 <1908000000>; - opp-microvolt = <861000>; - }; - - opp-2016000000 { - opp-hz = /bits/ 64 <2016000000>; - opp-microvolt = <911000>; - }; - - opp-2108000000 { - opp-hz = /bits/ 64 <2108000000>; - opp-microvolt = <951000>; - }; - - opp-2208000000 { - opp-hz = /bits/ 64 <2208000000>; - opp-microvolt = <1011000>; - }; + opp-1908000000 { + opp-hz = /bits/ 64 <1908000000>; + opp-microvolt = <861000>; + }; + + opp-2016000000 { + opp-hz = /bits/ 64 <2016000000>; + opp-microvolt = <911000>; + }; + + opp-2108000000 { + opp-hz = /bits/ 64 <2108000000>; + opp-microvolt = <951000>; + }; + + opp-2208000000 { + opp-hz = /bits/ 64 <2208000000>; + opp-microvolt = <1011000>; + }; }; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dts index c490dbbf063b..5913e59ff294 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dts @@ -64,7 +64,7 @@ }; &ir { - linux,rc-map-name = "rc-khamsin"; + linux,rc-map-name = "rc-khamsin"; }; /* This is connected to the Bluetooth module: */ diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi index e202d84f0672..d5e0f72892f8 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -642,7 +642,7 @@ function = "eth_led"; }; }; - + pwm_a_pins: pwm_a { mux { groups = "pwm_a"; |