Commit 031a612b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'hisi-arm64-dt-for-5.6' of git://github.com/hisilicon/linux-hisi into arm/dt

ARM64: DT: Hisilicon SoCs DT updates for 5.6

- Add remote control map name of the IR device for the hi3798cv200 poplar board
- Correct the PCIe bus range setting for the hi3798cv200

* tag 'hisi-arm64-dt-for-5.6' of git://github.com/hisilicon/linux-hisi:
  arm64: dts: hi3798cv200: correct PCIe 'bus-range' setting
  arm64: dts: hi3798cv200-poplar: add linux,rc-map-name for IR

Link: https://lore.kernel.org/r/5E169EDE.8020809@hisilicon.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6a346cf9 6fa154e4
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ &i2c2 {
};

&ir {
	linux,rc-map-name = "rc-hisi-poplar";
	status = "okay";
};

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ pcie: pcie@9860000 {
			#address-cells = <3>;
			#size-cells = <2>;
			device_type = "pci";
			bus-range = <0 15>;
			bus-range = <0x00 0xff>;
			num-lanes = <1>;
			ranges = <0x81000000 0x0 0x00000000 0x4f00000 0x0 0x100000
				  0x82000000 0x0 0x3000000 0x3000000 0x0 0x01f00000>;