Commit a6623f5f authored by Olof Johansson's avatar Olof Johansson

Merge tag 'arm-soc/for-4.18/devicetree-arm64-fixes' of...

Merge tag 'arm-soc/for-4.18/devicetree-arm64-fixes' of https://github.com/Broadcom/stblinux into fixes

This pull request contains Broadcom ARM64-based SoCs Device Tree fixes
for 4.18, please pull the following:

- Scott fixes both the bcm958742k and bcm958742t reference boards to
  have the correct eMMC voltage specified

- Ray fixes the I2C and PCIe Device Tree nodes interrupt specifiers for
  Northstar 2 and Stingray SoCs.

* tag 'arm-soc/for-4.18/devicetree-arm64-fixes' of https://github.com/Broadcom/stblinux:
  arm64: dts: Stingray: Fix I2C controller interrupt type
  arm64: dts: ns2: Fix PCIe controller interrupt type
  arm64: dts: ns2: Fix I2C controller interrupt type
  arm64: dts: specify 1.8V EMMC capabilities for bcm958742t
  arm64: dts: specify 1.8V EMMC capabilities for bcm958742k
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 0988e8e2 75af23c4
...@@ -118,7 +118,7 @@ pcie0: pcie@20020000 { ...@@ -118,7 +118,7 @@ pcie0: pcie@20020000 {
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 0>; interrupt-map-mask = <0 0 0 0>;
interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 281 IRQ_TYPE_NONE>; interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 281 IRQ_TYPE_LEVEL_HIGH>;
linux,pci-domain = <0>; linux,pci-domain = <0>;
...@@ -149,7 +149,7 @@ pcie4: pcie@50020000 { ...@@ -149,7 +149,7 @@ pcie4: pcie@50020000 {
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 0>; interrupt-map-mask = <0 0 0 0>;
interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 305 IRQ_TYPE_NONE>; interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 305 IRQ_TYPE_LEVEL_HIGH>;
linux,pci-domain = <4>; linux,pci-domain = <4>;
...@@ -566,7 +566,7 @@ i2c0: i2c@66080000 { ...@@ -566,7 +566,7 @@ i2c0: i2c@66080000 {
reg = <0x66080000 0x100>; reg = <0x66080000 0x100>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
interrupts = <GIC_SPI 394 IRQ_TYPE_NONE>; interrupts = <GIC_SPI 394 IRQ_TYPE_LEVEL_HIGH>;
clock-frequency = <100000>; clock-frequency = <100000>;
status = "disabled"; status = "disabled";
}; };
...@@ -594,7 +594,7 @@ i2c1: i2c@660b0000 { ...@@ -594,7 +594,7 @@ i2c1: i2c@660b0000 {
reg = <0x660b0000 0x100>; reg = <0x660b0000 0x100>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
interrupts = <GIC_SPI 395 IRQ_TYPE_NONE>; interrupts = <GIC_SPI 395 IRQ_TYPE_LEVEL_HIGH>;
clock-frequency = <100000>; clock-frequency = <100000>;
status = "disabled"; status = "disabled";
}; };
......
...@@ -43,6 +43,10 @@ &gphy0 { ...@@ -43,6 +43,10 @@ &gphy0 {
enet-phy-lane-swap; enet-phy-lane-swap;
}; };
&sdio0 {
mmc-ddr-1_8v;
};
&uart2 { &uart2 {
status = "okay"; status = "okay";
}; };
......
...@@ -42,3 +42,7 @@ / { ...@@ -42,3 +42,7 @@ / {
&gphy0 { &gphy0 {
enet-phy-lane-swap; enet-phy-lane-swap;
}; };
&sdio0 {
mmc-ddr-1_8v;
};
...@@ -409,7 +409,7 @@ i2c0: i2c@b0000 { ...@@ -409,7 +409,7 @@ i2c0: i2c@b0000 {
reg = <0x000b0000 0x100>; reg = <0x000b0000 0x100>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
interrupts = <GIC_SPI 177 IRQ_TYPE_NONE>; interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>;
clock-frequency = <100000>; clock-frequency = <100000>;
status = "disabled"; status = "disabled";
}; };
...@@ -453,7 +453,7 @@ i2c1: i2c@e0000 { ...@@ -453,7 +453,7 @@ i2c1: i2c@e0000 {
reg = <0x000e0000 0x100>; reg = <0x000e0000 0x100>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
interrupts = <GIC_SPI 178 IRQ_TYPE_NONE>; interrupts = <GIC_SPI 178 IRQ_TYPE_LEVEL_HIGH>;
clock-frequency = <100000>; clock-frequency = <100000>;
status = "disabled"; status = "disabled";
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment