mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-28 11:18:45 +07:00
This pull request brings in installation of the RPi3 DT in 32-bit
mode, the new thermal nodes, and switches to the faster sdhost controller for MMC. -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEE/JuuFDWp9/ZkuCBXtdYpNtH8nugFAlk5jpMACgkQtdYpNtH8 nuh8ew/9H2GhALOe8rDm1+c18xViJD851C4fkXb6sFIlq0rYUE9lSu2cDUCtSRPb Fqtpovdhmn3sXpujbWRzUXE72+gUyZzEbM50zGtxiR44RDNyjmjmxb9vRxmbNq1q xOzOE41HRR06fju07eYK7JHjN4OHuZufGiZ8D2X34Q6/poE7yscEPXFRcIomEIIO rDcSGMERpHcnVHjusV3TVwcFp/Myl3h9x6VQwoBaTHK9zclBrVr90/qz6QjTzQDP wmkRLmnQTbdj/8+rQA1dIDmYLV6KM1huylEecmgShr8ywQIQGiEiG+ttY+QTGtMp fzT2AkkEf2D2azm4OeJbHP8oK80nZTj4VvRrbNh6Iknu+Fr+DhNg1aR8FG6beimw xuKdsGm+2jrTeSuOvNxbeEKvQxNzPjJauG66BZo97mWzrPmg94GDH36g/hk/sen+ PXOdSPHSH6WlueFrEbUtp6dXTf1TECkv89zOk/UTKfN82dPRFph3HvSkzqZvZ+JV NHQtBwlSVz6VXodYCRw4TpyWqKnXRmP7r/p2BBN906JJ4PvWQVzzmDFgMNb9YV1V cwZMNDenxcfwjAAtPnBObw5I0ebxixyQEfM78rIhPzPryvOg2gpvZDVSPQz2dmCz LoaAZ+woeIvPspY6Pc2OF2X31GDlqgLa+RXhLX5N+f4RWgqQ5ss= =KEDG -----END PGP SIGNATURE----- Merge tag 'bcm2835-dt-next-2017-06-08' into bcm2835-dt-64-next This merge brings in the cpu-thermal node we in bcm283x that we need in order to set the rpi3's coefficients.
This commit is contained in:
commit
9c7a316570
@ -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 \
|
||||
|
@ -65,13 +65,13 @@ &i2c2 {
|
||||
&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>;
|
||||
};
|
||||
|
||||
|
@ -24,6 +24,10 @@ arm-pmu {
|
||||
};
|
||||
};
|
||||
|
||||
&cpu_thermal {
|
||||
coefficients = <(-538) 407000>;
|
||||
};
|
||||
|
||||
/* enable thermal sensor with the correct compatible property set */
|
||||
&thermal {
|
||||
compatible = "brcm,bcm2835-thermal";
|
||||
|
@ -77,6 +77,10 @@ &intc {
|
||||
interrupts = <8>;
|
||||
};
|
||||
|
||||
&cpu_thermal {
|
||||
coefficients = <(-538) 407000>;
|
||||
};
|
||||
|
||||
/* enable thermal sensor with the correct compatible property set */
|
||||
&thermal {
|
||||
compatible = "brcm,bcm2836-thermal";
|
||||
|
1
arch/arm/boot/dts/bcm2837-rpi-3-b.dts
Normal file
1
arch/arm/boot/dts/bcm2837-rpi-3-b.dts
Normal file
@ -0,0 +1 @@
|
||||
#include "arm64/broadcom/bcm2837-rpi-3-b.dts"
|
@ -1,6 +1,6 @@
|
||||
/ {
|
||||
aliases {
|
||||
ethernet = ðernet;
|
||||
ethernet0 = ðernet;
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
/ {
|
||||
aliases {
|
||||
ethernet = ðernet;
|
||||
ethernet0 = ðernet;
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -19,6 +19,26 @@ chosen {
|
||||
bootargs = "earlyprintk console=ttyAMA0";
|
||||
};
|
||||
|
||||
thermal-zones {
|
||||
cpu_thermal: cpu-thermal {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <1000>;
|
||||
|
||||
thermal-sensors = <&thermal>;
|
||||
|
||||
trips {
|
||||
cpu-crit {
|
||||
temperature = <80000>;
|
||||
hysteresis = <0>;
|
||||
type = "critical";
|
||||
};
|
||||
};
|
||||
|
||||
cooling-maps {
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
soc {
|
||||
compatible = "simple-bus";
|
||||
#address-cells = <1>;
|
||||
@ -198,8 +218,8 @@ i2c0_gpio0: i2c0_gpio0 {
|
||||
brcm,pins = <0 1>;
|
||||
brcm,function = <BCM2835_FSEL_ALT0>;
|
||||
};
|
||||
i2c0_gpio32: i2c0_gpio32 {
|
||||
brcm,pins = <32 34>;
|
||||
i2c0_gpio28: i2c0_gpio28 {
|
||||
brcm,pins = <28 29>;
|
||||
brcm,function = <BCM2835_FSEL_ALT0>;
|
||||
};
|
||||
i2c0_gpio44: i2c0_gpio44 {
|
||||
@ -295,20 +315,28 @@ uart0_gpio14: uart0_gpio14 {
|
||||
/* Separate from the uart0_gpio14 group
|
||||
* because it conflicts with spi1_gpio16, and
|
||||
* people often run uart0 on the two pins
|
||||
* without flow contrl.
|
||||
* without flow control.
|
||||
*/
|
||||
uart0_ctsrts_gpio16: uart0_ctsrts_gpio16 {
|
||||
brcm,pins = <16 17>;
|
||||
brcm,function = <BCM2835_FSEL_ALT3>;
|
||||
};
|
||||
uart0_gpio30: uart0_gpio30 {
|
||||
uart0_ctsrts_gpio30: uart0_ctsrts_gpio30 {
|
||||
brcm,pins = <30 31>;
|
||||
brcm,function = <BCM2835_FSEL_ALT3>;
|
||||
};
|
||||
uart0_ctsrts_gpio32: uart0_ctsrts_gpio32 {
|
||||
uart0_gpio32: uart0_gpio32 {
|
||||
brcm,pins = <32 33>;
|
||||
brcm,function = <BCM2835_FSEL_ALT3>;
|
||||
};
|
||||
uart0_gpio36: uart0_gpio36 {
|
||||
brcm,pins = <36 37>;
|
||||
brcm,function = <BCM2835_FSEL_ALT2>;
|
||||
};
|
||||
uart0_ctsrts_gpio38: uart0_ctsrts_gpio38 {
|
||||
brcm,pins = <38 39>;
|
||||
brcm,function = <BCM2835_FSEL_ALT2>;
|
||||
};
|
||||
|
||||
uart1_gpio14: uart1_gpio14 {
|
||||
brcm,pins = <14 15>;
|
||||
@ -326,10 +354,6 @@ uart1_ctsrts_gpio30: uart1_ctsrts_gpio30 {
|
||||
brcm,pins = <30 31>;
|
||||
brcm,function = <BCM2835_FSEL_ALT5>;
|
||||
};
|
||||
uart1_gpio36: uart1_gpio36 {
|
||||
brcm,pins = <36 37 38 39>;
|
||||
brcm,function = <BCM2835_FSEL_ALT2>;
|
||||
};
|
||||
uart1_gpio40: uart1_gpio40 {
|
||||
brcm,pins = <40 41>;
|
||||
brcm,function = <BCM2835_FSEL_ALT5>;
|
||||
@ -426,6 +450,7 @@ thermal: thermal@7e212000 {
|
||||
compatible = "brcm,bcm2835-thermal";
|
||||
reg = <0x7e212000 0x8>;
|
||||
clocks = <&clocks BCM2835_CLOCK_TSENS>;
|
||||
#thermal-sensor-cells = <0>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user