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

Unverified Commit 39b1aae7 authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Merge tag 'bcm2835-dt-64-next-2017-06-08' into devicetree-arm64/next 



This pull request brings in the switch to sdhost for MMC on RPi3
(improving storage performance and leaving sdhci for wireless), and
the correct CPU thermal coefficients.

The thermal changes required a merge from bcm2835-dt-next, where the
nodes were added.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents 779ec2a6 4ae6f954

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ 
	bcm2835-rpi-b-plus.dtb \

	bcm2835-rpi-a-plus.dtb \

	bcm2836-rpi-2-b.dtb \

	bcm2837-rpi-3-b.dtb \

	bcm2835-rpi-zero.dtb

dtb-$(CONFIG_ARCH_BCM_5301X) += \

	bcm4708-asus-rt-ac56u.dtb \

arch/arm/boot/dts/bcm2835-rpi.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -65,13 +65,13 @@ 
&sdhci {

	pinctrl-names = "default";

	pinctrl-0 = <&emmc_gpio48>;

	status = "okay";

	bus-width = <4>;

};



&sdhost {

	pinctrl-names = "default";

	pinctrl-0 = <&sdhost_gpio48>;

	status = "okay";

	bus-width = <4>;

};

arch/arm/boot/dts/bcm2835.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ 
	};

};



&cpu_thermal {

	coefficients = <(-538)	407000>;

};



/* enable thermal sensor with the correct compatible property set */

&thermal {

	compatible = "brcm,bcm2835-thermal";

arch/arm/boot/dts/bcm2836.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -77,6 +77,10 @@ 
	interrupts = <8>;

};



&cpu_thermal {

	coefficients = <(-538)	407000>;

};



/* enable thermal sensor with the correct compatible property set */

&thermal {

	compatible = "brcm,bcm2836-thermal";

arch/arm/boot/dts/bcm2837-rpi-3-b.dts

0 → 100644
+1 −0
Original line number Diff line number Diff line 
#include "arm64/broadcom/bcm2837-rpi-3-b.dts"