mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mvebu dt64 for 5.19 (part 1) 

Update sdhci node names to match schema on all mvebu dt64 dtsi files
 
 Armada 3720:
   uDPU board:
    - correct temperature sensors
    - update partition table
 
   espressobin-ultra board:
    - enable front USB3 port
    - add PHY and switch reset pins
    - fix SPI-NOR config
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQQYqXDMF3cvSLY+g9cLBhiOFHI71QUCYn5V1gAKCRALBhiOFHI7
 1TVQAJ94AlT0HrG28feqooyMbkSjACZcPgCgrYZcUD85wr8RuGWMOR04JV1WdFk=
 =sFNY
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-dt64-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/dt

mvebu dt64 for 5.19 (part 1)

Update sdhci node names to match schema on all mvebu dt64 dtsi files

Armada 3720:
  uDPU board:
   - correct temperature sensors
   - update partition table

  espressobin-ultra board:
   - enable front USB3 port
   - add PHY and switch reset pins
   - fix SPI-NOR config

* tag 'mvebu-dt64-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  arm64: dts: marvell: Update sdhci node names to match schema
  arm64: dts: marvell: espressobin-ultra: enable front USB3 port
  arm64: dts: marvell: espressobin-ultra: add PHY and switch reset pins
  arm64: dts: marvell: espressobin-ultra: fix SPI-NOR config
  arm64: dts: uDPU: correct temperature sensors
  arm64: dts: uDPU: update partition table

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-05-13 16:31:01 +02:00
parent 9dd7a5a896 239466bddf
commit 5aef4d1ecc
5 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
View File

@ -71,10 +71,6 @@
&spi0 {
flash@0 {
spi-max-frequency = <108000000>;
spi-rx-bus-width = <4>;
spi-tx-bus-width = <4>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
@ -112,18 +108,21 @@
&usb3 {
usb-phy = <&usb3_phy>;
status = "disabled";
};
&mdio {
extphy: ethernet-phy@1 {
reg = <1>;
reset-gpios = <&gpionb 2 GPIO_ACTIVE_LOW>;
};
};
&switch0 {
reg = <3>;
reset-gpios = <&gpiosb 23 GPIO_ACTIVE_LOW>;
ports {
switch0port1: port@1 {
reg = <1>;

19
arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
View File

@ -108,10 +108,15 @@
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
/* only bootloader is located on the SPI */
partition@0 {
label = "uboot";
reg = <0 0x400000>;
label = "firmware";
reg = <0x0 0x180000>;
};
partition@180000 {
label = "u-boot-env";
reg = <0x180000 0x10000>;
};
};
};
@ -148,15 +153,15 @@
scl-gpios = <&gpionb 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
sda-gpios = <&gpionb 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
lm75@48 {
nct375@48 {
status = "okay";
compatible = "lm75";
compatible = "ti,tmp75c";
reg = <0x48>;
};
lm75@49 {
nct375@49 {
status = "okay";
compatible = "lm75";
compatible = "ti,tmp75c";
reg = <0x49>;
};
};

4
arch/arm64/boot/dts/marvell/armada-37xx.dtsi
View File

@ -444,7 +444,7 @@
#mbox-cells = <1>;
};
sdhci1: sdhci@d0000 {
sdhci1: mmc@d0000 {
compatible = "marvell,armada-3700-sdhci",
"marvell,sdhci-xenon";
reg = <0xd0000 0x300>,
@ -455,7 +455,7 @@
status = "disabled";
};
sdhci0: sdhci@d8000 {
sdhci0: mmc@d8000 {
compatible = "marvell,armada-3700-sdhci",
"marvell,sdhci-xenon";
reg = <0xd8000 0x300>,

2
arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
View File

@ -250,7 +250,7 @@
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
};
ap_sdhci0: sdhci@6e0000 {
ap_sdhci0: mmc@6e0000 {
compatible = "marvell,armada-ap806-sdhci";
reg = <0x6e0000 0x300>;
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;

2
arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
View File

@ -493,7 +493,7 @@
status = "okay";
};
CP11X_LABEL(sdhci0): sdhci@780000 {
CP11X_LABEL(sdhci0): mmc@780000 {
compatible = "marvell,armada-cp110-sdhci";
reg = <0x780000 0x300>;
interrupts = <27 IRQ_TYPE_LEVEL_HIGH>;