Commit 390dc69e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'versatile-dts-1' of... 

Merge tag 'versatile-dts-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/dt

Versatile DTS changes, baseline for the v4.7 series:
- Add CLCD panel nodes to PB1176 and PB11MPCore
- Add a DT binding blurb for the Versatile IB2 syscon
- Add DTS files for the (QEMU supported) RealView EB
  boards in all variants.
- Add DTS files for the (QEMU supported) RealView PBA8
  and PBX-A9 board variants.

* tag 'versatile-dts-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator

:
  ARM: dts: realview: DT support for the PBA8 and PBX-A9
  ARM: dts: realview: support all the RealView EB board variants
  ARM: dts: realview: PB1176: define a standard VGA panel
  ARM: dts: realview: PB11MPCore: define a standard VGA panel
  Documentation/DT: add blurb for IB2 syscon to Versatile

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 16757cbc dfc8a117

Documentation/devicetree/bindings/arm/arm-boards

+8 −0
Original line number Diff line number Diff line
@@ -93,6 +93,14 @@ Required nodes: 
  a core-module with regs and the compatible strings

  "arm,core-module-versatile", "syscon"



Optional nodes:



- arm,versatile-ib2-syscon : if the Versatile has an IB2 interface

  board mounted, this has a separate system controller that is

  defined in this node.

  Required properties:

  compatible = "arm,versatile-ib2-syscon", "syscon"



ARM RealView Boards

-------------------

The RealView boards cover tailored evaluation boards that are used to explore

arch/arm/boot/dts/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -552,7 +552,13 @@ dtb-$(CONFIG_ARCH_QCOM) += \ 
	qcom-msm8974-sony-xperia-honami.dtb

dtb-$(CONFIG_ARCH_REALVIEW) += \

	arm-realview-pb1176.dtb \

	arm-realview-pb11mp.dtb

	arm-realview-pb11mp.dtb \

	arm-realview-eb.dtb \

	arm-realview-eb-11mp.dtb \

	arm-realview-eb-11mp-revb.dtb \

	arm-realview-eb-a9mp.dtb \

	arm-realview-pba8.dtb \

	arm-realview-pbx-a9.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += \

	rk3036-evb.dtb \

	rk3036-kylin.dtb \

arch/arm/boot/dts/arm-realview-eb-11mp-revb.dts

0 → 100644
+93 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2016 Linaro Ltd

 *

 * Permission is hereby granted, free of charge, to any person obtaining a copy

 * of this software and associated documentation files (the "Software"), to deal

 * in the Software without restriction, including without limitation the rights

 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

 * copies of the Software, and to permit persons to whom the Software is

 * furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 * THE SOFTWARE.

 */



#include "arm-realview-eb-11mp.dts"



/ {

	model = "ARM RealView Emulation Baseboard with ARM11MPCore Rev B";

};



/*

 * The revision B has a distinctly different layout of the syscon, so

 * append a specific compatible-string.

 */

&syscon {

	compatible = "arm,realview-eb11mp-revb-syscon", "arm,realview-eb-syscon", "syscon", "simple-mfd";

};



&intc {

	reg = <0x10101000 0x1000>,

	      <0x10100100 0x100>;

};



&L2 {

	reg = <0x10102000 0x1000>;

};



&scu {

	reg = <0x10100000 0x100>;

};



&twd_timer {

	reg = <0x10100600 0x20>;

};



&twd_wdog {

	reg = <0x10100620 0x20>;

};



/*

 * On revision B, we cannot reach the secondary interrupt

 * controller, as a result, some peripherals that are dependent

 * on their IRQ cannot be reached, so disable them.

 */

&intc_second {

	status = "disabled";

};



&gpio0 {

	status = "disabled";

};



&gpio1 {

	status = "disabled";

};



&gpio2 {

	status = "disabled";

};



&serial2 {

	status = "disabled";

};



&serial3 {

	status = "disabled";

};



&ssp {

	status = "disabled";

};



&wdog {

	status = "disabled";

};

arch/arm/boot/dts/arm-realview-eb-11mp.dts

0 → 100644
+74 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2016 Linaro Ltd

 *

 * Permission is hereby granted, free of charge, to any person obtaining a copy

 * of this software and associated documentation files (the "Software"), to deal

 * in the Software without restriction, including without limitation the rights

 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

 * copies of the Software, and to permit persons to whom the Software is

 * furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 * THE SOFTWARE.

 */



/dts-v1/;

#include "arm-realview-eb-mp.dtsi"



/ {

	model = "ARM RealView Emulation Baseboard with ARM11MPCore Rev C";

	arm,hbi = <0x146>;



	/*

	 * This is the ARM11 MPCore tile (HBI-0146) used with the RealView EB.

	 * Reference: ARM DUI 0318F

	 *

	 * To run this machine with QEMU, specify the following:

	 * qemu-system-arm -M realview-eb-mpcore -smp cpus=4

	 */

	cpus {

		#address-cells = <1>;

		#size-cells = <0>;

		enable-method = "arm,realview-smp";



		MP11_0: cpu@0 {

			device_type = "cpu";

			compatible = "arm,arm11mpcore";

			reg = <0>;

			next-level-cache = <&L2>;

		};



		MP11_1: cpu@1 {

			device_type = "cpu";

			compatible = "arm,arm11mpcore";

			reg = <1>;

			next-level-cache = <&L2>;

		};



		MP11_2: cpu@2 {

			device_type = "cpu";

			compatible = "arm,arm11mpcore";

			reg = <2>;

			next-level-cache = <&L2>;

		};



		MP11_3: cpu@3 {

			device_type = "cpu";

			compatible = "arm,arm11mpcore";

			reg = <3>;

			next-level-cache = <&L2>;

		};

	};

};



&pmu {

	interrupt-affinity = <&MP11_0>, <&MP11_1>, <&MP11_2>, <&MP11_3>;

};

arch/arm/boot/dts/arm-realview-eb-a9mp.dts

0 → 100644
+70 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2016 Linaro Ltd

 *

 * Permission is hereby granted, free of charge, to any person obtaining a copy

 * of this software and associated documentation files (the "Software"), to deal

 * in the Software without restriction, including without limitation the rights

 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

 * copies of the Software, and to permit persons to whom the Software is

 * furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 * THE SOFTWARE.

 */



/dts-v1/;

#include "arm-realview-eb-mp.dtsi"



/ {

	model = "ARM RealView EB Cortex A9 MPCore";



	/*

	 * This is the Cortex A9 MPCore tile used with the

	 * RealView EB.

	 */

	cpus {

		#address-cells = <1>;

		#size-cells = <0>;

		enable-method = "arm,realview-smp";



		A9_0: cpu@0 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <0>;

			next-level-cache = <&L2>;

		};



		A9_1: cpu@1 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <1>;

			next-level-cache = <&L2>;

		};



		A9_2: cpu@2 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <2>;

			next-level-cache = <&L2>;

		};



		A9_3: cpu@3 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <3>;

			next-level-cache = <&L2>;

		};

	};

};



&pmu {

	interrupt-affinity = <&A9_0>, <&A9_1>, <&A9_2>, <&A9_3>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE