Commit 3f0be4df authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Versatile DTS updates for the v5.8 kernel:

Create a new device tree for the Integrator/AP with the
IM-PD1 expansion module fitted in the first slot.

If we want to augment the slot where it is sitting, we can
alter the device tree or make the bootloader do so.

* tag 'versatile-dts-v5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: dts: Add devicetree for Integrator/AP with IM-PD1

Link: https://lore.kernel.org/r/CACRpkdZ-28o+pPdP7i_fc+7g4ndPWf+SWTsjnhFEegTggiXVSg@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents dca296dd d67ef24a

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ dtb-$(CONFIG_ARCH_HIX5HD2) += \ 
	hisi-x5hd2-dkb.dtb

dtb-$(CONFIG_ARCH_INTEGRATOR) += \

	integratorap.dtb \

	integratorap-im-pd1.dtb \

	integratorcp.dtb

dtb-$(CONFIG_ARCH_IXP4XX) += \

	intel-ixp42x-linksys-nslu2.dtb \

arch/arm/boot/dts/integratorap-im-pd1.dts

0 → 100644
+270 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Device Tree for the ARM Integrator/AP platform

 * with the IM-PD1 example logical module mounted.

 */



#include "integratorap.dts"



/ {

	model = "ARM Integrator/AP with IM-PD1";

	compatible = "arm,integrator-ap";



	reserved-memory {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		impd1_ram: vram@c2000000 {

			/* 1 MB of designated video RAM on the IM-PD1 */

			compatible = "shared-dma-pool";

			reg = <0xc2000000 0x00100000>;

			no-map;

		};

	};

};



&lm0 {

	syscon@0 {

		compatible = "arm,im-pd1-syscon", "syscon";

		reg = <0x00000000 0x1000>;



		vco1: clock@00 {

			compatible = "arm,impd1-vco1";

			#clock-cells = <0>;

			lock-offset = <0x08>;

			vco-offset = <0x00>;

			clocks = <&sysclk>;

			clock-output-names = "IM-PD1-VCO1";

		};



		vco2: clock@04 {

			compatible = "arm,impd1-vco2";

			#clock-cells = <0>;

			lock-offset = <0x08>;

			vco-offset = <0x04>;

			clocks = <&sysclk>;

			clock-output-names = "IM-PD1-VCO2";

		};

	};



	/* Also used for the Smart Card Interface SCI */

	impd1_uartclk: clock@1_4 {

		compatible = "fixed-factor-clock";

		#clock-cells = <0>;

		clock-div = <4>;

		clock-mult = <1>;

		clocks = <&vco2>;

		clock-output-names = "VCO2_DIV4";

	};



	/* For the SSP the clock is divided by 64 */

	impd1_sspclk: clock@1_64 {

		compatible = "fixed-factor-clock";

		#clock-cells = <0>;

		clock-div = <64>;

		clock-mult = <1>;

		clocks = <&vco2>;

		clock-output-names = "VCO2_DIV64";

	};



	/* Fixed regulator for the MMC */

	impd1_3v3: regulator {

		compatible = "regulator-fixed";

		regulator-name = "3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

	};



	/* Push buttons on the IM-PD1 */

	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		button@0 {

			debounce-interval = <50>;

			linux,code = <KEY_UP>;

			label = "UP";

			gpios = <&impd1_gpio1 0 GPIO_ACTIVE_HIGH>;

		};

		button@1 {

			debounce-interval = <50>;

			linux,code = <KEY_DOWN>;

			label = "DOWN";

			gpios = <&impd1_gpio1 1 GPIO_ACTIVE_HIGH>;

		};

		button@2 {

			debounce-interval = <50>;

			linux,code = <KEY_LEFT>;

			label = "LEFT";

			gpios = <&impd1_gpio1 2 GPIO_ACTIVE_HIGH>;

		};

		button@3 {

			debounce-interval = <50>;

			linux,code = <KEY_RIGHT>;

			label = "UP";

			gpios = <&impd1_gpio1 3 GPIO_ACTIVE_HIGH>;

		};

		button@4 {

			debounce-interval = <50>;

			linux,code = <KEY_ESC>;

			label = "ESC";

			gpios = <&impd1_gpio1 4 GPIO_ACTIVE_HIGH>;

		};

		button@5 {

			debounce-interval = <50>;

			linux,code = <KEY_ENTER>;

			label = "ENTER";

			gpios = <&impd1_gpio1 5 GPIO_ACTIVE_HIGH>;

		};

	};





	bridge {

		compatible = "ti,ths8134b", "ti,ths8134";

		#address-cells = <1>;

		#size-cells = <0>;



		ports {

			#address-cells = <1>;

			#size-cells = <0>;

			port@0 {

				reg = <0>;

					vga_bridge_in: endpoint {

					remote-endpoint = <&clcd_pads_vga_dac>;

				};

			};



			port@1 {

				reg = <1>;



				vga_bridge_out: endpoint {

					remote-endpoint = <&vga_con_in>;

				};

			};

		};

	};



	vga {

		compatible = "vga-connector";



		port {

			vga_con_in: endpoint {

				remote-endpoint = <&vga_bridge_out>;

			};

		};

	};



	uart@100000 {

		compatible = "arm,pl011", "arm,primecell";

		reg = <0x00100000 0x1000>;

		interrupts-extended = <&impd1_vic 1>;

		clocks = <&impd1_uartclk>, <&sysclk>;

		clock-names = "uartclk", "apb_pclk";

	};



	uart@200000 {

		compatible = "arm,pl011", "arm,primecell";

		reg = <0x00200000 0x1000>;

		interrupts-extended = <&impd1_vic 2>;

		clocks = <&impd1_uartclk>, <&sysclk>;

		clock-names = "uartclk", "apb_pclk";

	};



	ssp@300000 {

		compatible = "arm,pl022", "arm,primecell";

		reg = <0x00300000 0x1000>;

		interrupts-extended = <&impd1_vic 3>;

		clocks = <&impd1_sspclk>, <&sysclk>;

		clock-names = "spiclk", "apb_pclk";

	};



	impd1_gpio0: gpio@400000 {

		compatible = "arm,pl061", "arm,primecell";

		reg = <0x00400000 0x1000>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

		interrupts-extended = <&impd1_vic 4>;

		clocks = <&sysclk>;

		clock-names = "apb_pclk";

	};



	impd1_gpio1: gpio@500000 {

		compatible = "arm,pl061", "arm,primecell";

		reg = <0x00500000 0x1000>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

		interrupts-extended = <&impd1_vic 5>;

		clocks = <&sysclk>;

		clock-names = "apb_pclk";

	};



	rtc@600000 {

		compatible = "arm,pl030", "arm,primecell";

		reg = <0x00600000 0x1000>;

		interrupts-extended = <&impd1_vic 6>;

		clocks = <&sysclk>;

		clock-names = "apb_pclk";

	};



	mmc@700000 {

		compatible = "arm,pl181", "arm,primecell";

		reg = <0x00700000 0x1000>;

		interrupts-extended = <&impd1_vic 7>,

				    <&impd1_vic 8>;

		clocks = <&sysclk>, <&sysclk>;

		clock-names = "mclk", "apb_pclk";

		bus-width = <1>;

		max-frequency = <515633>;

		vmmc-supply = <&impd1_3v3>;

		wp-gpios = <&impd1_gpio0 3 GPIO_ACTIVE_HIGH>;

		cd-gpios = <&impd1_gpio0 4 GPIO_ACTIVE_LOW>;

	};



	aaci@800000 {

		compatible = "arm,pl041", "arm,primecell";

		reg = <0x00800000 0x1000>;

		interrupts-extended = <&impd1_vic 9>;

		clocks = <&sysclk>;

		clock-names = "apb_pclk";

	};



	display@1000000 {

		compatible = "arm,pl110", "arm,primecell";

		reg = <0x01000000 0x1000>;

		interrupts-extended = <&impd1_vic 11>;

		clocks = <&vco1>, <&sysclk>;

		clock-names = "clcdclk", "apb_pclk";

		/* 640x480 16bpp @ 25.175MHz is 36827428 bytes/s */

		max-memory-bandwidth = <40000000>;

		memory-region = <&impd1_ram>;



		port@0 {

			#address-cells = <1>;

			#size-cells = <0>;



			clcd_pads_vga_dac: endpoint@0 {

				reg = <0>;

				remote-endpoint = <&vga_bridge_in>;

				arm,pl11x,tft-r0g0b0-pads = <0 8 16>;

			};

		};

	};



	impd1_vic: interrupt-controller@3000000 {

		compatible = "arm,pl192-vic";

		interrupt-controller;

		#interrupt-cells = <1>;

		reg = <0x03000000 0x1000>;

		/* Valid interrupts, 0-9 and 11 */

		valid-mask = <0x00000bff>;

		/* LM site 0 has IRQ 9 on the PIC */

		interrupts-extended = <&pic 9>;

	};

};

arch/arm/boot/dts/integratorap.dts

+49 −4
Original line number Diff line number Diff line
@@ -4,7 +4,9 @@ 
 */



/dts-v1/;

/include/ "integrator.dtsi"

#include "integrator.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>



/ {

	model = "ARM Integrator/AP";
@@ -107,9 +109,6 @@ 
	syscon {

		compatible = "arm,integrator-ap-syscon", "syscon";

		reg = <0x11000000 0x100>;

		interrupt-parent = <&pic>;

		/* These are the logical module IRQs */

		interrupts = <9>, <10>, <11>, <12>;



		/*

		 * SYSCLK clocks PCIv3 bridge, system controller and the
@@ -239,4 +238,50 @@ 
			clock-names = "KMIREFCLK", "apb_pclk";

		};

	};



	/*

	 * Logic module bus, we support up to 4 logical modules

	 * They appear at 0xc0000000, 0xd0000000, 0xe0000000 and 0xf0000000

	 * and use interrupts 9, 10, 11 and 12 respectively.

	 */

	bus@c0000000 {

		compatible = "arm,integrator-ap-lm";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0xc0000000 0xc0000000 0x40000000>;

		dma-ranges;



		lm0: bus@c0000000 {

			compatible = "simple-bus";

			ranges = <0x00000000 0xc0000000 0x10000000>;

			dma-ranges = <0x00000000 0x80000000 0x10000000>;

			reg = <0xc0000000 0x10000000>;

			#address-cells = <1>;

			#size-cells = <1>;

		};

		lm1: bus@d0000000 {

			compatible = "simple-bus";

			ranges = <0x00000000 0xd0000000 0x10000000>;

			dma-ranges = <0x00000000 0x80000000 0x10000000>;

			reg = <0xd0000000 0x10000000>;

			#address-cells = <1>;

			#size-cells = <1>;

		};

		lm2: bus@e0000000 {

			compatible = "simple-bus";

			ranges = <0x00000000 0xe0000000 0x10000000>;

			dma-ranges = <0x00000000 0x80000000 0x10000000>;

			reg = <0xe0000000 0x10000000>;

			#address-cells = <1>;

			#size-cells = <1>;

		};

		lm3: bus@f0000000 {

			compatible = "simple-bus";

			ranges = <0x00000000 0xf0000000 0x10000000>;

			dma-ranges = <0x00000000 0x80000000 0x10000000>;

			reg = <0xf0000000 0x10000000>;

			#address-cells = <1>;

			#size-cells = <1>;

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE