mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-31 10:31:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'mvebu-dt-7.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/dt

Browse Source 
mvebu dt for 7.3 (part 1)

Add regulator supplies for helios4 (Armada 388 based)
Correct indentation on dts files

* tag 'mvebu-dt-7.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  ARM: dts: helios4: add SATA regulator supplies
  ARM: dts: helios4: add vcc-supply to GPIO expander
  ARM: dts: helios4: add vcc-supply to EEPROM
  ARM: dts: marvell: orion5x: Correct indentation
  ARM: dts: marvell: kirkwood: Correct indentation
  ARM: dts: marvell: armada: Correct indentation

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
This commit is contained in:
Alexandre Belloni
2026-08-17 15:06:22 +02:00
parent 6fdec78001 7a90520e8c
commit 63dbd330b5
11 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/boot/dts/marvell/armada-370.dtsi
View File

@@ -63,8 +63,8 @@ pcie0: pcie@1,0 {
interrupt-names = "intx";
interrupts-extended = <&mpic 58>;
#interrupt-cells = <1>;
ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0
0x81000000 0 0 0x81000000 0x1 0 1 0>;
ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0
0x81000000 0 0 0x81000000 0x1 0 1 0>;
bus-range = <0x00 0xff>;
interrupt-map-mask = <0 0 0 7>;
interrupt-map = <0 0 0 1 &pcie0_intc 0>,
@@ -91,8 +91,8 @@ pcie2: pcie@2,0 {
interrupt-names = "intx";
interrupts-extended = <&mpic 62>;
#interrupt-cells = <1>;
ranges = <0x82000000 0 0 0x82000000 0x2 0 1 0
0x81000000 0 0 0x81000000 0x2 0 1 0>;
ranges = <0x82000000 0 0 0x82000000 0x2 0 1 0
0x81000000 0 0 0x81000000 0x2 0 1 0>;
bus-range = <0x00 0xff>;
interrupt-map-mask = <0 0 0 7>;
interrupt-map = <0 0 0 1 &pcie2_intc 0>,

13
arch/arm/boot/dts/marvell/armada-388-helios4.dts
View File

@@ -169,6 +169,7 @@ expander0: gpio-expander@20 {
gpio-controller;
#gpio-cells = <2>;
reg = <0x20>;
vcc-supply = <&reg_3p3v>;
pinctrl-names = "default";
pinctrl-0 = <&pca0_pins>;
interrupt-parent = <&gpio0>;
@@ -201,6 +202,10 @@ temp_sensor: temp@4c {
reg = <0x4c>;
vcc-supply = <&reg_3p3v>;
};
eeprom@53 {
vcc-supply = <&reg_3p3v>;
};
};
i2c@11100 {
@@ -217,13 +222,17 @@ sata@a8000 {
status = "okay";
#address-cells = <1>;
#size-cells = <0>;
ahci-supply = <&reg_3p3v>;
phy-supply = <&reg_3p3v>;
sata0: sata-port@0 {
reg = <0>;
target-supply = <&reg_5p0v_hdd>;
};
sata1: sata-port@1 {
reg = <1>;
target-supply = <&reg_5p0v_hdd>;
};
};
@@ -231,13 +240,17 @@ sata@e0000 {
status = "okay";
#address-cells = <1>;
#size-cells = <0>;
ahci-supply = <&reg_3p3v>;
phy-supply = <&reg_3p3v>;
sata2: sata-port@0 {
reg = <0>;
target-supply = <&reg_5p0v_hdd>;
};
sata3: sata-port@1 {
reg = <1>;
target-supply = <&reg_5p0v_hdd>;
};
};

14
arch/arm/boot/dts/marvell/armada-xp-gp.dts
View File

@@ -34,13 +34,13 @@ chosen {
memory@0 {
device_type = "memory";
/*
* 8 GB of plug-in RAM modules by default.The amount
* of memory available can be changed by the
* bootloader according the size of the module
* actually plugged. However, memory between
* 0xF0000000 to 0xFFFFFFFF cannot be used, as it is
* the address range used for I/O (internal registers,
* MBus windows).
* 8 GB of plug-in RAM modules by default.The amount
* of memory available can be changed by the
* bootloader according the size of the module
* actually plugged. However, memory between
* 0xF0000000 to 0xFFFFFFFF cannot be used, as it is
* the address range used for I/O (internal registers,
* MBus windows).
*/
reg = <0x00000000 0x00000000 0x00000000 0xf0000000>,
<0x00000001 0x00000000 0x00000001 0x00000000>;

4
arch/arm/boot/dts/marvell/kirkwood-b3.dts
View File

@@ -94,10 +94,10 @@ i2c@11000 {
serial@12000 {
/* Internal on test pins, 3.3v TTL
* UART0_RX = Testpoint 65
* UART0_RX = Testpoint 65
* UART0_TX = Testpoint 66
* See the Excito Wiki for more details.
*/
*/
status = "okay";
};

2
arch/arm/boot/dts/marvell/kirkwood-netgear_readynas_duo_v2.dts
View File

@@ -239,7 +239,7 @@ ethernet0-port@0 {
};
&pciec {
status = "okay";
status = "okay";
};
&pcie0 {

2
arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi
View File

@@ -83,7 +83,7 @@ &mdio {
status = "okay";
ethphy0: ethernet-phy@X {
/* overwrite reg property in board file */
/* overwrite reg property in board file */
};
};

2
arch/arm/boot/dts/marvell/kirkwood-openblocks_a6.dts
View File

@@ -109,7 +109,7 @@ led-yellow {
label = "obsa6:yellow:stat";
gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
};
};
};
gpio_keys {
compatible = "gpio-keys";

2
arch/arm/boot/dts/marvell/kirkwood-openblocks_a7.dts
View File

@@ -130,7 +130,7 @@ led-yellow {
label = "obsa7:yellow:stat";
gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
};
};
};
gpio_keys {
compatible = "gpio-keys";

2
arch/arm/boot/dts/marvell/kirkwood-ts419.dtsi
View File

@@ -57,7 +57,7 @@ &mdio {
ethphy1: ethernet-phy@1 {
device_type = "ethernet-phy";
/* overwrite reg property in board file */
/* overwrite reg property in board file */
};
};

2
arch/arm/boot/dts/marvell/orion5x-lacie-d2-network.dts
View File

@@ -109,7 +109,7 @@ flash@0 {
compatible = "cfi-flash";
reg = <0 0x80000>;
bank-width = <1>;
#address-cells = <1>;
#address-cells = <1>;
#size-cells = <1>;
partition@0 {

2
arch/arm/boot/dts/marvell/orion5x-maxtor-shared-storage-2.dts
View File

@@ -69,7 +69,7 @@ flash@0 {
compatible = "cfi-flash";
reg = <0 0x40000>;
bank-width = <1>;
#address-cells = <1>;
#address-cells = <1>;
#size-cells = <1>;
};
};