Commit e4b79c3b authored by Olof Johansson's avatar Olof Johansson

Merge tag 'tegra-for-4.13-arm64-dt' of...

Merge tag 'tegra-for-4.13-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt64

arm64: tegra: Device tree changes for v4.13-rc1

This adds the CCPLEX cluster on Tegra186, which is used to initiate CPU
frequency and voltage transitions.

Also included is a bit of cleanup for PCI related device tree content,
in preparation for a future DTC release that has additional checks for
the PCI bus.

* tag 'tegra-for-4.13-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  arm64: dts: nvidia: fix PCI bus dtc warnings
  arm64: tegra: Add CCPLEX_CLUSTER area in Tegra186
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 010da09e 475d99fc
...@@ -12,7 +12,7 @@ / { ...@@ -12,7 +12,7 @@ / {
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
pcie-controller@01003000 { pcie@1003000 {
compatible = "nvidia,tegra124-pcie"; compatible = "nvidia,tegra124-pcie";
device_type = "pci"; device_type = "pci";
reg = <0x0 0x01003000 0x0 0x00000800 /* PADS registers */ reg = <0x0 0x01003000 0x0 0x00000800 /* PADS registers */
...@@ -55,6 +55,7 @@ pci@1,0 { ...@@ -55,6 +55,7 @@ pci@1,0 {
device_type = "pci"; device_type = "pci";
assigned-addresses = <0x82000800 0 0x01000000 0 0x1000>; assigned-addresses = <0x82000800 0 0x01000000 0 0x1000>;
reg = <0x000800 0 0 0 0>; reg = <0x000800 0 0 0 0>;
bus-range = <0x00 0xff>;
status = "disabled"; status = "disabled";
#address-cells = <3>; #address-cells = <3>;
...@@ -68,6 +69,7 @@ pci@2,0 { ...@@ -68,6 +69,7 @@ pci@2,0 {
device_type = "pci"; device_type = "pci";
assigned-addresses = <0x82001000 0 0x01001000 0 0x1000>; assigned-addresses = <0x82001000 0 0x01001000 0 0x1000>;
reg = <0x001000 0 0 0 0>; reg = <0x001000 0 0 0 0>;
bus-range = <0x00 0xff>;
status = "disabled"; status = "disabled";
#address-cells = <3>; #address-cells = <3>;
......
...@@ -348,6 +348,13 @@ pmc@c360000 { ...@@ -348,6 +348,13 @@ pmc@c360000 {
reg-names = "pmc", "wake", "aotag", "scratch"; reg-names = "pmc", "wake", "aotag", "scratch";
}; };
ccplex@e000000 {
compatible = "nvidia,tegra186-ccplex-cluster";
reg = <0x0 0x0e000000 0x0 0x3fffff>;
nvidia,bpmp = <&bpmp>;
};
gpu@17000000 { gpu@17000000 {
compatible = "nvidia,gp10b"; compatible = "nvidia,gp10b";
reg = <0x0 0x17000000 0x0 0x1000000>, reg = <0x0 0x17000000 0x0 0x1000000>,
......
...@@ -7,7 +7,7 @@ / { ...@@ -7,7 +7,7 @@ / {
model = "NVIDIA Jetson TX1 Developer Kit"; model = "NVIDIA Jetson TX1 Developer Kit";
compatible = "nvidia,p2371-2180", "nvidia,tegra210"; compatible = "nvidia,p2371-2180", "nvidia,tegra210";
pcie-controller@01003000 { pcie@1003000 {
status = "okay"; status = "okay";
avdd-pll-uerefe-supply = <&avdd_1v05_pll>; avdd-pll-uerefe-supply = <&avdd_1v05_pll>;
......
...@@ -11,7 +11,7 @@ / { ...@@ -11,7 +11,7 @@ / {
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
pcie-controller@01003000 { pcie@1003000 {
compatible = "nvidia,tegra210-pcie"; compatible = "nvidia,tegra210-pcie";
device_type = "pci"; device_type = "pci";
reg = <0x0 0x01003000 0x0 0x00000800 /* PADS registers */ reg = <0x0 0x01003000 0x0 0x00000800 /* PADS registers */
...@@ -51,6 +51,7 @@ pci@1,0 { ...@@ -51,6 +51,7 @@ pci@1,0 {
device_type = "pci"; device_type = "pci";
assigned-addresses = <0x82000800 0 0x01000000 0 0x1000>; assigned-addresses = <0x82000800 0 0x01000000 0 0x1000>;
reg = <0x000800 0 0 0 0>; reg = <0x000800 0 0 0 0>;
bus-range = <0x00 0xff>;
status = "disabled"; status = "disabled";
#address-cells = <3>; #address-cells = <3>;
...@@ -64,6 +65,7 @@ pci@2,0 { ...@@ -64,6 +65,7 @@ pci@2,0 {
device_type = "pci"; device_type = "pci";
assigned-addresses = <0x82001000 0 0x01001000 0 0x1000>; assigned-addresses = <0x82001000 0 0x01001000 0 0x1000>;
reg = <0x001000 0 0 0 0>; reg = <0x001000 0 0 0 0>;
bus-range = <0x00 0xff>;
status = "disabled"; status = "disabled";
#address-cells = <3>; #address-cells = <3>;
......
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