Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c70ceb79 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'berlin-dt-for-v4.18' of... 

Merge tag 'berlin-dt-for-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin into next/dt

berlin DT changes for v4.18

* tag 'berlin-dt-for-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin

:
  ARM: dts: berlin2q: move PMU node from soc to root
  ARM: dts: berlin*-dts: use SPDX-License-Identifier for berlin based board
  ARM: dts: berlin*.dtsi: use SPDX-License-Identifier for berlin SoCs
  ARM: dts: berlin2: fix irq type for arm twd timer
  ARM: dts: berlin2q: fix irq type for arm twd timer
  ARM: dts: berlin2q: add "cache-unified" to l2 node
  ARM: dts: berlin2q: add interrupt-affinity to pmu node
  ARM: dts: chromecast: use PWM for LEDs
  ARM: dts: chromecast: override bad bootloader memory info
  ARM: dts: berlin2cd: add Valve Steam Link board
  ARM: dts: berlin2cd: add a label for the CPU node
  ARM: dts: berlin2cd: add remaining nodes to apb subtrees
  ARM: dts: berlin2cd: add remaining Cortex-A9 nodes
  ARM: dts: berlin2cd: add ADC/thermal sensor node
  ARM: dts: berlin2cd: move PMU node from soc to root
  ARM: dts: berlin2cd: fix local timer interrupt flags

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents fef8f9b1 15cf848d

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ dtb-$(CONFIG_ARCH_BCM_NSP) += \ 
dtb-$(CONFIG_ARCH_BERLIN) += \

	berlin2-sony-nsz-gs7.dtb \

	berlin2cd-google-chromecast.dtb \

	berlin2cd-valve-steamlink.dtb \

	berlin2q-marvell-dmp.dtb

dtb-$(CONFIG_ARCH_BRCMSTB) += \

	bcm7445-bcm97445svmb.dtb

arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts

+1 −32
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0 OR MIT)

/*

 * Device Tree file for Sony NSZ-GS7

 *

 * Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

 *

 * This file is dual-licensed: you can use it either under the terms

 * of the GPL or the X11 license, at your option. Note that this dual

 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *  a) This file is licensed under the terms of the GNU General Public

 *     License version 2. This program is licensed "as is" without any

 *     warranty of any kind, whether express or implied.

 *

 * Or, alternatively,

 *

 *  b) 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/;

arch/arm/boot/dts/berlin2.dtsi

+2 −33
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0 OR MIT)

/*

 * Device Tree Include file for Marvell Armada 1500 (Berlin BG2) SoC

 *
@@ -5,38 +6,6 @@ 
 *

 * based on GPL'ed 2.6 kernel sources

 *  (c) Marvell International Ltd.

 *

 * This file is dual-licensed: you can use it either under the terms

 * of the GPL or the X11 license, at your option. Note that this dual

 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *  a) This file is licensed under the terms of the GNU General Public

 *     License version 2. This program is licensed "as is" without any

 *     warranty of any kind, whether express or implied.

 *

 * Or, alternatively,

 *

 *  b) 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 <dt-bindings/clock/berlin2.h>
@@ -149,7 +118,7 @@ 
		local-timer@ad0600 {

			compatible = "arm,cortex-a9-twd-timer";

			reg = <0xad0600 0x20>;

			interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;

			interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>;

			clocks = <&chip_clk CLKID_TWD>;

		};

arch/arm/boot/dts/berlin2cd-google-chromecast.dts

+27 −38
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0 OR MIT)

/*

 * Device Tree file for Google Chromecast

 *

 * Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

 *

 * This file is dual-licensed: you can use it either under the terms

 * of the GPL or the X11 license, at your option. Note that this dual

 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *  a) This file is licensed under the terms of the GNU General Public

 *     License version 2. This program is licensed "as is" without any

 *     warranty of any kind, whether express or implied.

 *

 * Or, alternatively,

 *

 *  b) 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/;
@@ -52,22 +21,35 @@ 


	memory@0 {

		device_type = "memory";

		reg = <0x00000000 0x20000000>; /* 512 MB */



		/*

		 * We're using "linux,usable-memory" instead of "reg" here

		 * because the (signed and encrypted) bootloader that shipped

		 * with this device provides an incorrect memory range in

		 * ATAG_MEM. Linux helpfully overrides the "reg" property with

		 * data from the ATAG, so we can't specify the proper range

		 * normally. Fortunately, this alternate property is checked

		 * first by the OF driver, so we can (ab)use it instead.

		 */

		linux,usable-memory = <0x00000000 0x20000000>; /* 512 MB */

	};



	leds {

		compatible = "gpio-leds";

		compatible = "pwm-leds";

		pinctrl-0 = <&ledpwm_pmux>;

		pinctrl-names = "default";



		white {

			label = "white";

			gpios = <&portc 1 GPIO_ACTIVE_HIGH>;

			default-state = "keep";

			pwms = <&pwm 0 600000 0>;

			max-brightness = <255>;

			linux,default-trigger = "default-on";

		};



		red {

			label = "red";

			gpios = <&portc 2 GPIO_ACTIVE_HIGH>;

			default-state = "keep";

			pwms = <&pwm 1 600000 0>;

			max-brightness = <255>;

		};

	};

};
@@ -86,3 +68,10 @@ 
&usb_phy1 { status = "okay"; };



&usb1 { status = "okay"; };



&soc_pinctrl {

	ledpwm_pmux: ledpwm-pmux {

		groups = "G0";

		function = "pwm";

	};

};

arch/arm/boot/dts/berlin2cd-valve-steamlink.dts

0 → 100644
+79 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0 OR MIT)

/*

 * Copyright 2018 Alexander Monakov <amonakov@gmail.com>

 */

/dts-v1/;



#include "berlin2cd.dtsi"

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



/ {

	model = "Valve Steam Link";

	compatible = "valve,steamlink", "marvell,berlin2cd", "marvell,berlin";



	memory@0 {

		device_type = "memory";

		reg = <0x00000000 0x20000000>; /* 512 MB */

	};



	gpio-restart {

		compatible = "gpio-restart";

		gpios = <&porta 6 GPIO_ACTIVE_HIGH>;

		active-delay = <100>;

		inactive-delay = <10>;

		wait-delay = <100>;

		priority = <200>;

	};

};



&cpu {

	cpu-supply = <&vcpu>;

	operating-points = <

		/* kHz    uV */

		1000000 1325000

	>;

};



&i2c0 {

	status = "okay";



	/* There are two regulators on the board. One is accessible via I2C,

	 * with buck1 providing SoC power (set up by bootloader to 1.325V or

	 * less depending on leakage value in OTP), and buck2 likely used for

	 * DRAM (providing 1.35V). The other regulator on the opposite side

	 * of the board is probably supplying SDIO and NAND fixed voltages. */

	regulator@19 {

		compatible = "marvell,88pg868";

		reg = <0x19>;



		vcpu: buck1 {

			regulator-boot-on;

			regulator-always-on;

			regulator-min-microvolt = <1000000>;

			regulator-max-microvolt = <1325000>;

		};

	};

};



/* Fixed interface to on-board Marvell 8897 Wi-Fi/Bluetooth/NFC chip. */

&sdhci0 {

	keep-power-in-suspend;

	non-removable;

	status = "okay";

};



&uart0 {

	/* RX/TX are routed to TP50/TP51 on the board. */

	status = "okay";

};



/* The SoC is connected to on-board USB hub that in turn has one downstream

 * port wired to the on-board Steam Controller wireless receiver chip. */

&usb_phy1 { status = "okay"; };



&usb1 {

	dr_mode = "host";

	status = "okay";

};



&eth1 { status = "okay"; };