diff mbox series

sandbox: Update PCI nodes in dts files

Message ID 20200211174123.31881-1-trini@konsulko.com
State Accepted
Commit 42c64d1bc9d5d3c68f14b872ab71ec7d5fe97cbc
Headers show
Series sandbox: Update PCI nodes in dts files | expand

Commit Message

Tom Rini Feb. 11, 2020, 5:41 p.m. UTC 
The way the PCI nodes are written today causes a number of warnings if
we stop disabling some of the warnings we pass to DTC.  As these
warnings aren't disabled in current Linux Kernel builds, we should aim
to not disable them here either, so rewrite these slightly.  Update the
driver model doc as well.

Cc: Simon Glass <sjg at chromium.org>
Signed-off-by: Tom Rini <trini at konsulko.com>
---
 arch/sandbox/dts/sandbox.dts   |  5 +++--
 arch/sandbox/dts/sandbox.dtsi  |  2 +-
 arch/sandbox/dts/sandbox64.dts |  5 +++--
 arch/sandbox/dts/test.dts      |  9 ++++++---
 doc/driver-model/pci-info.rst  | 10 +++++-----
 5 files changed, 18 insertions(+), 13 deletions(-)
diff mbox series

Patch

diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts
index 4dd82f6a32fd..2d7db0249ebe 100644
--- a/arch/sandbox/dts/sandbox.dts
+++ b/arch/sandbox/dts/sandbox.dts
@@ -10,7 +10,7 @@ 
 
 	aliases {
 		i2c0 = &i2c_0;
-		pci0 = &pci;
+		pci0 = &pcic;
 		rtc0 = &rtc_0;
 		axi0 = &axi;
 		spi0 = &spi;
@@ -52,9 +52,10 @@ 
 		pinctrl-0 = <&pinctrl_i2c0>;
 	};
 
-	pci: pci-controller {
+	pcic: pci at 0 {
 		compatible = "sandbox,pci";
 		device_type = "pci";
+		bus-range = <0x00 0xff>;
 		#address-cells = <3>;
 		#size-cells = <2>;
 		ranges = <0x02000000 0 0x10000000 0x10000000 0 0x2000
diff --git a/arch/sandbox/dts/sandbox.dtsi b/arch/sandbox/dts/sandbox.dtsi
index 7bf144f53265..f7f3de784292 100644
--- a/arch/sandbox/dts/sandbox.dtsi
+++ b/arch/sandbox/dts/sandbox.dtsi
@@ -99,7 +99,7 @@ 
 		};
 	};
 
-	pci-controller {
+	pci at 0 {
 		pci at 1e,0 {
 			compatible = "sandbox,pmc";
 			reg = <0xf000 0 0 0 0>;
diff --git a/arch/sandbox/dts/sandbox64.dts b/arch/sandbox/dts/sandbox64.dts
index 5c95cee9d7a9..97e33f110eef 100644
--- a/arch/sandbox/dts/sandbox64.dts
+++ b/arch/sandbox/dts/sandbox64.dts
@@ -10,7 +10,7 @@ 
 
 	aliases {
 		i2c0 = &i2c_0;
-		pci0 = &pci;
+		pci0 = &pcic;
 		rtc0 = &rtc_0;
 		axi0 = &axi;
 		spi0 = &spi;
@@ -47,9 +47,10 @@ 
 		pinctrl-0 = <&pinctrl_i2c0>;
 	};
 
-	pci: pci-controller {
+	pcic: pci at 0 {
 		compatible = "sandbox,pci";
 		device_type = "pci";
+		bus-range = <0x00 0xff>;
 		#address-cells = <3>;
 		#size-cells = <2>;
 		ranges = <0x02000000 0 0x10000000 0 0x10000000 0 0x2000
diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index c22844743143..4d3c42077858 100644
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -463,9 +463,10 @@ 
 		compatible = "sandbox,pch";
 	};
 
-	pci0: pci-controller0 {
+	pci0: pci at 0 {
 		compatible = "sandbox,pci";
 		device_type = "pci";
+		bus-range = <0x00 0xff>;
 		#address-cells = <3>;
 		#size-cells = <2>;
 		ranges = <0x02000000 0 0x10000000 0x10000000 0 0x2000000
@@ -531,9 +532,10 @@ 
 		};
 	};
 
-	pci1: pci-controller1 {
+	pci1: pci at 1 {
 		compatible = "sandbox,pci";
 		device_type = "pci";
+		bus-range = <0x00 0xff>;
 		#address-cells = <3>;
 		#size-cells = <2>;
 		ranges = <0x02000000 0 0x30000000 0x30000000 0 0x2000
@@ -546,9 +548,10 @@ 
 		};
 	};
 
-	pci2: pci-controller2 {
+	pci2: pci at 2 {
 		compatible = "sandbox,pci";
 		device_type = "pci";
+		bus-range = <0x00 0xff>;
 		#address-cells = <3>;
 		#size-cells = <2>;
 		ranges = <0x02000000 0 0x50000000 0x50000000 0 0x2000
diff --git a/doc/driver-model/pci-info.rst b/doc/driver-model/pci-info.rst
index 3c1b1adf077e..8b9faa106638 100644
--- a/doc/driver-model/pci-info.rst
+++ b/doc/driver-model/pci-info.rst
@@ -12,10 +12,10 @@  Bus number 0 will need to be requested first, and the alias in the device
 tree file will point to the correct device::
 
 	aliases {
-		pci0 = &pci;
+		pci0 = &pcic;
 	};
 
-	pci: pci-controller {
+	pcic: pci at 0 {
 		compatible = "sandbox,pci";
 		...
 	};
@@ -138,7 +138,7 @@  be scanned as a PCI device, causing confusion.
 
 When this bus is scanned we will end up with something like this::
 
-   `- * pci-controller @ 05c660c8, 0
+   `- * pci at 0 @ 05c660c8, 0
     `-   pci at 1f,0 @ 05c661c8, 63488
    `-   emul at 1f,0 @ 05c662c8
 
@@ -152,7 +152,7 @@  host controller node for this functionality to work.
 
 .. code-block:: none
 
-	pci1: pci-controller1 {
+	pci1: pci at 1 {
 		compatible = "sandbox,pci";
 		...
 		sandbox,dev-info = <0x08 0x00 0x1234 0x5678
@@ -166,6 +166,6 @@  fourth cells are PCI vendor ID and device ID respectively.
 
 When this bus is scanned we will end up with something like this::
 
- pci        [ + ]   pci_sandbo  |-- pci-controller1
+ pci        [ + ]   pci_sandbo  |-- pci1
  pci_emul   [   ]   sandbox_sw  |   |-- sandbox_swap_case_emul
  pci_emul   [   ]   sandbox_sw  |   `-- sandbox_swap_case_emul