mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

- mt7623 

- delete unsupported reference board
 - fix pio leds
 - add missing cooling device
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCAA1FiEEiUuSfQSYnG8EMsBltDliWyzx00MFAltZhhoXHG1hdHRoaWFz
 LmJnZ0BnbWFpbC5jb20ACgkQtDliWyzx00NVYg//XCBIAvsKUNaC2U6DKdvnS4Hc
 wL9IHGicH81C6lQbHBKZM6lpx7vb6ANldj33ioc6q/5a68h21UW0kwi/jfkFpCPv
 ALQJGieMd32IMz4zo5Kkk30joqt7wx9JEs/ijqHLIx9N6oyxzwSsjJxTAUhNt9x0
 Yh+dTEUL0FW3dRIyq3f5m7AWMDSOeDSc6n1dxMpOveLSPHRLRqRU6kVzBxlOvv/x
 Izhi8RXDVnH+mjLlsO7cb8THrYbUGMGx5SFxzyCP6Ag6WPF9FPuAHzXxcoQwoDmE
 +vFs9L9hq8G6jANLsRP75nCsacsLVeDLgFmU7nb0Ok4LMwDU+9dzBf+9LYe4sZQO
 JcqzMjmULBmDAWVL6+SXKX+SSGFyCOZ85YR0WB9gBYsxyVbmSRkuGjI7WMeN893t
 N+3WYIlt0CLxmXUiFkaut1tKtzLyYgRf/71kp4DkonrJXd9PvGpQpZXdEJ49s6hf
 4rdmX1NeU8LntcvAIeZ9hXhLhZiH6aYr9WkiRxPr2q4sBZG5Zp7uFFZEoYgENvlS
 9e7E/eMG4UTFNmWBXo+fzA5yNDEPjenvWWRLL/dYt6X9RnjX8gAy8mv6xCHHsGa7
 3xQw7gCc1NANO0g3imlim4XuW+Ap/a7Atz+mR+OoOc4ZNMeTXC2ubmIQd6aLJXsW
 9YPDRT2fndHOl/NLwTo=
 =P5yi
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2018-07-26 13:04:44 -07:00
parent 31342a2150 11a20c5601
commit 34fbee109b
6 changed files with 6 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/devicetree/bindings/arm/mediatek.txt
View 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:

1
arch/arm/boot/dts/Makefile
View 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

3
arch/arm/boot/dts/mt7623.dtsi
View 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>;
};
@ -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>;
};
};

6
arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
View File

@ -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";
};
};

73
arch/arm/boot/dts/mt7623n-rfb-nand.dts
View File

@ -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>;
};
};
};
};

86
arch/arm/boot/dts/mt7623n-rfb.dtsi
View File

@ -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";
};