Commit 98d70a5c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'arm-soc/for-5.3/devicetree-v2' of https://github.com/Broadcom/stblinux into arm/dt 

This pull request contain Broadcom ARM-based SoCs Device Tree changes
for 5.3 please pull the following:

- Lukas enables DMA support for the BCM2835 (Raspberry Pi) SPI
  controller

- Florian fixes a number of dtc W=1 warnings in the Broadcom DTS files
  and provides a fix for devices failing to boot after the removal of
  skelton.dtsi (that commit has been submitted as a separate fix)

* tag 'arm-soc/for-5.3/devicetree-v2' of https://github.com/Broadcom/stblinux

:
  ARM: dts: BCM5301X: Fix most DTC W=1 warnings
  ARM: dts: NSP: Fix the bulk of W=1 DTC warnings
  ARM: dts: BCM63xx: Fix DTC W=1 warnings
  ARM: dts: BCM53573: Fix DTC W=1 warnings
  ARM: dts: bcm-mobile: Fix most DTC W=1 warnings
  ARM: dts: Cygnus: Fix most DTC W=1 warnings
  ARM: dts: Fix BCM7445 DTC warnings
  ARM: bcm283x: Enable DMA support for SPI controller
  ARM: dts: bcm: Add missing device_type = "memory" property

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4ed7e4e5 dfa84bb9

arch/arm/boot/dts/bcm-cygnus-clock.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ clocks { 
	};



	/* Cygnus ARM PLL */

	armpll: armpll {

	armpll: armpll@19000000 {

		#clock-cells = <0>;

		compatible = "brcm,cygnus-armpll";

		clocks = <&osc>;
@@ -67,7 +67,7 @@ clocks { 
		clock-mult = <1>;

	};



	genpll: genpll {

	genpll: genpll@301d000 {

		#clock-cells = <1>;

		compatible = "brcm,cygnus-genpll";

		reg = <0x0301d000 0x2c>, <0x0301c020 0x4>;
@@ -94,7 +94,7 @@ clocks { 
		clock-mult = <1>;

	};



	lcpll0: lcpll0 {

	lcpll0: lcpll0@301d02c {

		#clock-cells = <1>;

		compatible = "brcm,cygnus-lcpll0";

		reg = <0x0301d02c 0x1c>, <0x0301c020 0x4>;
@@ -103,7 +103,7 @@ clocks { 
				     "usb_phy", "smart_card", "ch5";

	};



	mipipll: mipipll {

	mipipll: mipipll@180a9800 {

		#clock-cells = <1>;

		compatible = "brcm,cygnus-mipipll";

		reg = <0x180a9800 0x2c>, <0x0301c020 0x4>, <0x180aa024 0x4>;
@@ -113,7 +113,7 @@ clocks { 
				     "ch5_unused";

	};



	asiu_clks: asiu_clks {

	asiu_clks: asiu_clks@301d048 {

		#clock-cells = <1>;

		compatible = "brcm,cygnus-asiu-clk";

		reg = <0x0301d048 0xc>, <0x180aa024 0x4>;
@@ -122,7 +122,7 @@ clocks { 
		clock-output-names = "keypad", "adc/touch", "pwm";

	};



	audiopll: audiopll {

	audiopll: audiopll@180aeb00 {

		#clock-cells = <1>;

		compatible = "brcm,cygnus-audiopll";

		reg = <0x180aeb00 0x68>;

arch/arm/boot/dts/bcm-cygnus.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
		ethernet0 = &eth0;

	};



	memory {

	memory@0 {

		device_type = "memory";

		reg = <0 0>;

	};
@@ -69,7 +69,7 @@ 
		interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;

	};



	core {

	core@19000000 {

		compatible = "simple-bus";

		ranges = <0x00000000 0x19000000 0x1000000>;

		#address-cells = <1>;
@@ -91,7 +91,7 @@ 
			      <0x20100 0x100>;

		};



		L2: l2-cache {

		L2: l2-cache@22000 {

			compatible = "arm,pl310-cache";

			reg = <0x22000 0x1000>;

			cache-unified;

arch/arm/boot/dts/bcm-nsp.dtsi

+3 −6
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
		interrupt-affinity = <&cpu0>, <&cpu1>;

	};



	mpcore {

	mpcore@19000000 {

		compatible = "simple-bus";

		ranges = <0x00000000 0x19000000 0x00023000>;

		#address-cells = <1>;
@@ -122,7 +122,7 @@ 
			      <0x20100 0x100>;

		};



		L2: l2-cache {

		L2: l2-cache@22000 {

			compatible = "arm,pl310-cache";

			reg = <0x22000 0x1000>;

			cache-unified;
@@ -166,7 +166,7 @@ 
		};

	};



	axi {

	axi@18000000 {

		compatible = "simple-bus";

		ranges = <0x00000000 0x18000000 0x0011c40c>;

		#address-cells = <1>;
@@ -415,9 +415,6 @@ 
					  "imp_sleep_timer_p5",

					  "imp_sleep_timer_p7",

					  "imp_sleep_timer_p8";

			#address-cells = <1>;

			#size-cells = <0>;



			status = "disabled";



			/* ports are defined in board DTS */

arch/arm/boot/dts/bcm11351.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
		reg-io-width = <4>;

	};



	L2: l2-cache {

	L2: l2-cache@3ff20000 {

		compatible = "brcm,bcm11351-a2-pl310-cache";

		reg = <0x3ff20000 0x1000>;

		cache-unified;
@@ -225,21 +225,21 @@ 
		#size-cells = <1>;

		ranges;



		root_ccu: root_ccu {

		root_ccu: root_ccu@35001000 {

			compatible = "brcm,bcm11351-root-ccu";

			reg = <0x35001000 0x0f00>;

			#clock-cells = <1>;

			clock-output-names = "frac_1m";

		};



		hub_ccu: hub_ccu {

		hub_ccu: hub_ccu@34000000 {

			compatible = "brcm,bcm11351-hub-ccu";

			reg = <0x34000000 0x0f00>;

			#clock-cells = <1>;

			clock-output-names = "tmon_1m";

		};



		aon_ccu: aon_ccu {

		aon_ccu: aon_ccu@35002000 {

			compatible = "brcm,bcm11351-aon-ccu";

			reg = <0x35002000 0x0f00>;

			#clock-cells = <1>;
@@ -248,7 +248,7 @@ 
					     "pmu_bsc_var";

		};



		master_ccu: master_ccu {

		master_ccu: master_ccu@3f001000 {

			compatible = "brcm,bcm11351-master-ccu";

			reg = <0x3f001000 0x0f00>;

			#clock-cells = <1>;
@@ -261,7 +261,7 @@ 
					     "hsic2_12m";

		};



		slave_ccu: slave_ccu {

		slave_ccu: slave_ccu@3e011000 {

			compatible = "brcm,bcm11351-slave-ccu";

			reg = <0x3e011000 0x0f00>;

			#clock-cells = <1>;

arch/arm/boot/dts/bcm21664-garnet.dts

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
	model = "BCM21664 Garnet board";

	compatible = "brcm,bcm21664-garnet", "brcm,bcm21664";



	memory {

	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x40000000>; /* 1 GB */

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE