| Message ID | 20200624161528.12664-3-narmstrong@baylibre.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | cabb1f3827109372dcb80081cc654eb54f997afc |
| Headers | show |
| Series | *mfd: Add support for Khadas Microcontroller | expand |
Hi Kevin, Can you apply this patch ? the rest of the serie has been pulled into Lee's tree. Thanks, Neil On 24/06/2020 18:15, Neil Armstrong wrote: > Add the Khadas MCU node with active FAN thermal nodes for all the > Khadas VIM3 variants. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org> > --- > Hi Kevin, > > The bindings has been reviewed and merged by Lee, > could you apply this one via the amlogic tree ? > > Thanks, > Neil > > .../boot/dts/amlogic/meson-khadas-vim3.dtsi | 23 +++++++++++++++++++ > 1 file changed, 23 insertions(+) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi > index 1ef1e3672b96..27408c10a811 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi > @@ -183,6 +183,23 @@ > hdmi-phandle = <&hdmi_tx>; > }; > > +&cpu_thermal { > + trips { > + cpu_active: cpu-active { > + temperature = <80000>; /* millicelsius */ > + hysteresis = <2000>; /* millicelsius */ > + type = "active"; > + }; > + }; > + > + cooling-maps { > + map { > + trip = <&cpu_active>; > + cooling-device = <&khadas_mcu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; > + }; > + }; > +}; > + > &ext_mdio { > external_phy: ethernet-phy@0 { > /* Realtek RTL8211F (0x001cc916) */ > @@ -222,6 +239,12 @@ > pinctrl-0 = <&i2c_ao_sck_pins>, <&i2c_ao_sda_pins>; > pinctrl-names = "default"; > > + khadas_mcu: system-controller@18 { > + compatible = "khadas,mcu"; > + reg = <0x18>; > + #cooling-cells = <2>; > + }; > + > gpio_expander: gpio-controller@20 { > compatible = "ti,tca6408"; > reg = <0x20>; >
diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi index 1ef1e3672b96..27408c10a811 100644 --- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi @@ -183,6 +183,23 @@ hdmi-phandle = <&hdmi_tx>; }; +&cpu_thermal { + trips { + cpu_active: cpu-active { + temperature = <80000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "active"; + }; + }; + + cooling-maps { + map { + trip = <&cpu_active>; + cooling-device = <&khadas_mcu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; +}; + &ext_mdio { external_phy: ethernet-phy@0 { /* Realtek RTL8211F (0x001cc916) */ @@ -222,6 +239,12 @@ pinctrl-0 = <&i2c_ao_sck_pins>, <&i2c_ao_sda_pins>; pinctrl-names = "default"; + khadas_mcu: system-controller@18 { + compatible = "khadas,mcu"; + reg = <0x18>; + #cooling-cells = <2>; + }; + gpio_expander: gpio-controller@20 { compatible = "ti,tca6408"; reg = <0x20>;