diff options
| author | Olof Johansson <olof@lixom.net> | 2020-01-10 22:16:17 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-01-10 22:16:18 -0800 |
| commit | 031a612b16c214528554d269e9907767770a9304 (patch) | |
| tree | b2cf713214d9393778e5f875f075e7fbff11f905 | |
| parent | 6a346cf9738ac7d0235870bfc1223d5cc8f6b7d1 (diff) | |
| parent | 6fa154e46c723b1eaa24ad16fbe92c2a3bf98dbc (diff) | |
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: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts | 1 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts b/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts index c563d3eb2d98..7d370dac4c85 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts +++ b/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts @@ -170,6 +170,7 @@ }; &ir { + linux,rc-map-name = "rc-hisi-poplar"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi b/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi index 13821a0ff524..12bc1d3ed424 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi @@ -564,7 +564,7 @@ #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>; |