Merge tag 'v4.18-next-dts32' of https://git.kernel.org/pub/scm/linux/kernel/git/matth...
authorOlof Johansson <olof@lixom.net>
Thu, 26 Jul 2018 20:04:44 +0000 (13:04 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 26 Jul 2018 20:04:44 +0000 (13:04 -0700)
- 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: Olof Johansson <olof@lixom.net>
Documentation/devicetree/bindings/arm/mediatek.txt
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/mt7623.dtsi
arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
arch/arm/boot/dts/mt7623n-rfb-nand.dts [deleted file]
arch/arm/boot/dts/mt7623n-rfb.dtsi [deleted file]

index 7d21ab37c19cdf79c7ef54b942c7b518d7a57a27..c07ddf4b781997f7171bab252ace9a5947d3a891 100644 (file)
@@ -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:
index c1eb840580395012c7c849be6450569f076379bb..b5bd3de87c331ed9f7e85d43767c46c3831dfbcc 100644 (file)
@@ -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
index d1eb123bc73b8200989a197e3559eb7e2d543441..1cdc346a05e8be4deca54a1a20631f7312d91b57 100644 (file)
@@ -92,6 +92,7 @@
                                 <&apmixedsys CLK_APMIXED_MAINPLL>;
                        clock-names = "cpu", "intermediate";
                        operating-points-v2 = <&cpu_opp_table>;
+                       #cooling-cells = <2>;
                        clock-frequency = <1300000000>;
                };
 
                                 <&apmixedsys CLK_APMIXED_MAINPLL>;
                        clock-names = "cpu", "intermediate";
                        operating-points-v2 = <&cpu_opp_table>;
+                       #cooling-cells = <2>;
                        clock-frequency = <1300000000>;
                };
 
                                 <&apmixedsys CLK_APMIXED_MAINPLL>;
                        clock-names = "cpu", "intermediate";
                        operating-points-v2 = <&cpu_opp_table>;
+                       #cooling-cells = <2>;
                        clock-frequency = <1300000000>;
                };
        };
index 531d905d924ffd027daffe31eafbabb944484c31..2b760f90f38c8996437c4cc9a245d1f7e2b16356 100644 (file)
 
                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";
                };
        };
diff --git a/arch/arm/boot/dts/mt7623n-rfb-nand.dts b/arch/arm/boot/dts/mt7623n-rfb-nand.dts
deleted file mode 100644 (file)
index 96ff3c9..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-// 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>;
-                       };
-               };
-       };
-};
diff --git a/arch/arm/boot/dts/mt7623n-rfb.dtsi b/arch/arm/boot/dts/mt7623n-rfb.dtsi
deleted file mode 100644 (file)
index 5c5cc7d..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (c) 2017 MediaTek Inc.
- * Author: John Crispin <john@phrozen.org>
- *        Sean Wang <sean.wang@mediatek.com>
- *
- */
-
-/dts-v1/;
-#include "mt7623.dtsi"
-#include "mt6323.dtsi"
-
-/ {
-       aliases {
-               serial0 = &uart0;
-               serial1 = &uart1;
-               serial2 = &uart2;
-       };
-
-       chosen {
-               stdout-path = "serial2:115200n8";
-       };
-
-       cpus {
-               cpu0 {
-                       proc-supply = <&mt6323_vproc_reg>;
-               };
-
-               cpu1 {
-                       proc-supply = <&mt6323_vproc_reg>;
-               };
-
-               cpu2 {
-                       proc-supply = <&mt6323_vproc_reg>;
-               };
-
-               cpu3 {
-                       proc-supply = <&mt6323_vproc_reg>;
-               };
-       };
-
-       memory@80000000 {
-               device_type = "memory";
-               reg = <0 0x80000000 0 0x40000000>;
-       };
-
-       usb_p1_vbus: regulator-5v {
-               compatible = "regulator-fixed";
-               regulator-name = "usb_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpio = <&pio 135 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
-};
-
-&mmc0 {
-       vmmc-supply = <&mt6323_vemc3v3_reg>;
-       vqmmc-supply = <&mt6323_vio18_reg>;
-};
-
-&mmc1 {
-       vmmc-supply = <&mt6323_vmch_reg>;
-       vqmmc-supply = <&mt6323_vmc_reg>;
-};
-
-&uart0 {
-       status = "okay";
-};
-
-&uart1 {
-       status = "okay";
-};
-
-&uart2 {
-       status = "okay";
-};
-
-&usb1 {
-       vbus-supply = <&usb_p1_vbus>;
-       status = "okay";
-};
-
-&u3phy1 {
-       status = "okay";
-};