renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-05 04:04:01 +08:00
Code

Merge branch 'mmp/fixes' into arm/fixes

Browse Source 
These three fixes should make it into linux-5.7 and
also into the branch for other mmp dt changes for v5.8,
so I created a branch for them.

* mmp/fixes:
  ARM: dts: mmp3: Drop usb-nop-xceiv from HSIC phy
  ARM: dts: mmp3-dell-ariel: Fix the SPI devices
  ARM: dts: mmp3: Use the MMP3 compatible string for /clocks

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2020-05-21 23:35:26 +02:00
commit 1a55b4232d
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/boot/dts/mmp3-dell-ariel.dts
View File

@ -98,19 +98,19 @@
status = "okay"; status = "okay";
}; };
&ssp3 { &ssp1 {
status = "okay"; status = "okay";
cs-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
firmware-flash@0 { firmware-flash@0 {
compatible = "st,m25p80", "jedec,spi-nor"; compatible = "winbond,w25q32", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <40000000>; spi-max-frequency = <104000000>;
m25p,fast-read; m25p,fast-read;
}; };
}; };
&ssp4 { &ssp2 {
cs-gpios = <&gpio 56 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio 56 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
}; };

8
arch/arm/boot/dts/mmp3.dtsi
View File

@ -202,8 +202,7 @@
}; };
hsic_phy0: hsic-phy@f0001800 { hsic_phy0: hsic-phy@f0001800 {
compatible = "marvell,mmp3-hsic-phy", compatible = "marvell,mmp3-hsic-phy";
"usb-nop-xceiv";
reg = <0xf0001800 0x40>; reg = <0xf0001800 0x40>;
#phy-cells = <0>; #phy-cells = <0>;
status = "disabled"; status = "disabled";
@ -224,8 +223,7 @@
}; };
hsic_phy1: hsic-phy@f0002800 { hsic_phy1: hsic-phy@f0002800 {
compatible = "marvell,mmp3-hsic-phy", compatible = "marvell,mmp3-hsic-phy";
"usb-nop-xceiv";
reg = <0xf0002800 0x40>; reg = <0xf0002800 0x40>;
#phy-cells = <0>; #phy-cells = <0>;
status = "disabled"; status = "disabled";
@ -531,7 +529,7 @@
}; };
soc_clocks: clocks@d4050000 { soc_clocks: clocks@d4050000 {
compatible = "marvell,mmp2-clock"; compatible = "marvell,mmp3-clock";
reg = <0xd4050000 0x1000>, reg = <0xd4050000 0x1000>,
<0xd4282800 0x400>, <0xd4282800 0x400>,
<0xd4015000 0x1000>; <0xd4015000 0x1000>;