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

Commit 34fbee10 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v4.18-next-dts32' of... 

Merge tag 'v4.18-next-dts32' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into next/dt

- mt7623
- delete unsupported reference board
- fix pio leds
- add missing cooling device

* tag 'v4.18-next-dts32' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux

:
  dt-bindings: arm: mediatek: cleanup MT7623N reference boards
  arm: dts: mt7623: cleanup MT7623N NAND dts file
  arm: dts: mediatek: Fix pio-leds for Bananapi-R2
  arm: dts: mediatek: Add missing cooling device properties for CPUs

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 31342a21 11a20c56

Documentation/devicetree/bindings/arm/mediatek.txt

+0 −3
Original line number Diff line number Diff line
@@ -59,9 +59,6 @@ Supported boards: 
- Reference board for MT7623n with eMMC:

    Required root node properties:

      - compatible = "mediatek,mt7623n-rfb-emmc", "mediatek,mt7623";

- Reference  board for MT7623n with NAND:

    Required root node properties:

      - compatible = "mediatek,mt7623n-rfb-nand", "mediatek,mt7623";

- Bananapi BPI-R2 board:

      - compatible = "bananapi,bpi-r2", "mediatek,mt7623";

- MTK mt8127 tablet moose EVB:

arch/arm/boot/dts/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -1192,7 +1192,6 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ 
	mt7623a-rfb-emmc.dtb \

	mt7623a-rfb-nand.dtb \

	mt7623n-rfb-emmc.dtb \

	mt7623n-rfb-nand.dtb \

	mt7623n-bananapi-bpi-r2.dtb \

	mt8127-moose.dtb \

	mt8135-evbp1.dtb

arch/arm/boot/dts/mt7623.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ 
				 <&apmixedsys CLK_APMIXED_MAINPLL>;

			clock-names = "cpu", "intermediate";

			operating-points-v2 = <&cpu_opp_table>;

			#cooling-cells = <2>;

			clock-frequency = <1300000000>;

		};
@@ -103,6 +104,7 @@ 
				 <&apmixedsys CLK_APMIXED_MAINPLL>;

			clock-names = "cpu", "intermediate";

			operating-points-v2 = <&cpu_opp_table>;

			#cooling-cells = <2>;

			clock-frequency = <1300000000>;

		};
@@ -114,6 +116,7 @@ 
				 <&apmixedsys CLK_APMIXED_MAINPLL>;

			clock-names = "cpu", "intermediate";

			operating-points-v2 = <&cpu_opp_table>;

			#cooling-cells = <2>;

			clock-frequency = <1300000000>;

		};

	};

arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts

+3 −3
Original line number Diff line number Diff line
@@ -91,19 +91,19 @@ 


		blue {

			label = "bpi-r2:pio:blue";

			gpios = <&pio 241 GPIO_ACTIVE_HIGH>;

			gpios = <&pio 240 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		green {

			label = "bpi-r2:pio:green";

			gpios = <&pio 240 GPIO_ACTIVE_HIGH>;

			gpios = <&pio 241 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		red {

			label = "bpi-r2:pio:red";

			gpios = <&pio 239 GPIO_ACTIVE_HIGH>;

			gpios = <&pio 239 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};

	};

arch/arm/boot/dts/mt7623n-rfb-nand.dts

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

/*

 * Copyright (c) 2017 MediaTek Inc.

 * Author: John Crispin <john@phrozen.org>

 *

 */



/dts-v1/;

#include "mt7623n-rfb.dtsi"



/ {

	model = "MediaTek MT7623N NAND reference board";

	compatible = "mediatek,mt7623n-rfb-nand", "mediatek,mt7623";

};



&bch {

	status = "okay";

};



&nandc {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&nand_pins_default>;



	nand@0 {

		reg = <0>;

		spare_per_sector = <64>;

		nand-ecc-mode = "hw";

		nand-ecc-strength = <12>;

		nand-ecc-step-size = <1024>;



		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;



			partition@0 {

				label = "preloader";

				reg = <0x0 0x40000>;

			};



			partition@40000 {

				label = "uboot";

				reg = <0x40000 0x80000>;

			};



			partition@c0000 {

				label = "uboot-env";

				reg = <0xC0000 0x40000>;

			};



			partition@140000 {

				label = "bootimg";

				reg = <0x140000 0x2000000>;

			};



			partition@2140000 {

				label = "recovery";

				reg = <0x2140000 0x2000000>;

			};



			partition@4140000 {

				label = "rootfs";

				reg = <0x4140000 0x1000000>;

			};



			partition@5140000 {

				label = "usrdata";

				reg = <0x5140000 0x1000000>;

			};

		};

	};

};