korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allwinner SoC device tree changes for 6.12

Browse Source 
ARM64 device tree and binding-only changes
 - Move PMIC on RG35XX boards from RSB (Allwinner proprietary bus) to I2C
 - Introduce Anbernic RG35XX-SP board
 - Enable charger on RG35XX boards
 - Add thermal trip points for Allwinner A64 GPU
 -----BEGIN PGP SIGNATURE-----
 
 iQJCBAABCgAsFiEE2nN1m/hhnkhOWjtHOJpUIZwPJDAFAmbZ1TwOHHdlbnNAY3Np
 ZS5vcmcACgkQOJpUIZwPJDA10A//fUBe1dvKoWd7TJ2QKDsQt2NQtLDLhgKK00GH
 AAYFFS5XhwF7C1PlgIbnfM9jT87QP0UkYoAZd5seGOOdq5NIc7WkFw4jUM30JLFQ
 h+7rvShZx2kYTST5eSVUZOEIS6DG5OANU7fwQ9RbbScjow7V+3xXRmS8sMYhdo1Y
 9oAD96DyHChgIhMv7BB1gk8/IoWHrvqRCMwZlc5tlwA4Rli5/qSAJy/sx5xSuU3C
 EUmg7SCaeGFsNdYEafPP8ZcaKF8mOZOR023am/VkaJEMZ/nMmZScGWPzQ41+GX0+
 3pne5UW5v6A8V/MbV8yAGNnZcQmpidSMkbNb5qLkvkE9d604j+kWBK3NEAU2H3YW
 CIuDzoXwLlp4ZVmQEbAyd84vIOyhueS2EG4TO1K98aYutqTX6mzPIyHEyjPWjsrl
 ii8e4Iln+I5RL8wxdcR4VdSC99gQ9ak1XMDjRsE3qar5N7dguCuqeasabpxHfNsr
 24bmoAd1ECCXzUo9CJ2pY1+WJkQaRgOeqSzI2dmN2D/V5iBOvr9vuBLww/idPnGn
 QPWsi9TpTFNdHeoTT6meu0gEFyZNi1CCDPwc7GeNZKnOq1W5OMI26HL2MBjG29LY
 Lj4mRbcZPmXB0QoEWi0wF/Ppgxhxcs0kQnA1IC9eqNLXFxVXDa+3hKeaa5q5tMLO
 zaQXE8E=
 =pDWx
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmbaDLAACgkQYKtH/8kJ
 Uif1CxAAoAxNQYqERYzzDuY78BSunJ/QCpwjz7MtV75DKAo5IzLE72NXEPKZq9hT
 n3+MR1ib/66lIdS4cKk6Cre6nMtloUqasp6Ar7eUT08KqziMueBl29eHr6zJ2mCZ
 q3s4rGw+hBcGuAUxJPr8LlzVuTCYs6EsoyrhygdPENkJ0nnnPJpiCmx+m8eLlCME
 l5dSRss4DeAH0eZPMoEKTG0Ic6XJ/fA/nUivOAHZmXvHLodtiUuAVkswPi14Mhwu
 mx75f8nU1jrAx5JsKVGV1CpKxpFMXr2pgdEW3wtth7ZwGt4T6g/qCaFIEnI7dAe7
 8HqX98Sw+ZbXvNux0XtjTr0/77evhvdoLmTFD+vJGdHeF6EFuIQEL8cfU05BdLyT
 fPLOjKasYKT0tBO5Gg2O/4lvGRs3FzZNi49x+gQpyldOcIx0PzpgKrfnX7Kr9DOc
 ZsjiQWjMc5FCbkgBPla1shCUbFo4YlpxeXKnVy+iLZAUAyHknnVNJKS7PqIXCsep
 MYlyywaIRd5nVAeSaZ1wdxKgbpjNis2xLluvpNfeAto6Zq8KC/DKkTNQ4+Az64xK
 b6uxqUTjtwiRfwseZetsJJGvkMeT8iL9q/t9cQ4/0jQ4zXRlwkeG4d4d4VCagZmS
 1pLzj5Y8G9C7UukxOVfl9gIiW/ag3TL6GxuusFEtLFs4Khb9XuI=
 =uwt0
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-dt-for-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/dt

Allwinner SoC device tree changes for 6.12

ARM64 device tree and binding-only changes
- Move PMIC on RG35XX boards from RSB (Allwinner proprietary bus) to I2C
- Introduce Anbernic RG35XX-SP board
- Enable charger on RG35XX boards
- Add thermal trip points for Allwinner A64 GPU

* tag 'sunxi-dt-for-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: dts: allwinner: a64: Add GPU thermal trips to the SoC dtsi
  arm64: dts: allwinner: h700: Add charger for Anbernic RG35XX
  arm64: dts: allwinner: h700: Add Anbernic RG35XX-SP
  arm64: dts: allwinner: h616: Change RG35XX Series from r_rsb to r_i2c
  arm64: dts: allwinner: h616: Add r_i2c pinctrl nodes
  dt-bindings: arm: sunxi: Add Anbernic RG35XXSP

Link: https://lore.kernel.org/r/ZtnZRhTwsBeO7Qtb@wens.tw
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2024-09-05 19:55:18 +00:00
commit 15eb92636c
6 changed files with 85 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/devicetree/bindings/arm/sunxi.yaml
View File

@ -61,14 +61,19 @@ properties:
- const: anbernic,rg35xx-2024
- const: allwinner,sun50i-h700
- description: Anbernic RG35XX H
items:
- const: anbernic,rg35xx-h
- const: allwinner,sun50i-h700
- description: Anbernic RG35XX Plus
items:
- const: anbernic,rg35xx-plus
- const: allwinner,sun50i-h700
- description: Anbernic RG35XX H
- description: Anbernic RG35XX SP
items:
- const: anbernic,rg35xx-h
- const: anbernic,rg35xx-sp
- const: allwinner,sun50i-h700
- description: Amarula A64 Relic

3
arch/arm64/boot/dts/allwinner/Makefile
View File

@ -49,5 +49,6 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-orangepi-zero2w.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-orangepi-zero3.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-transpeed-8k618-t.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h700-anbernic-rg35xx-2024.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h700-anbernic-rg35xx-plus.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h700-anbernic-rg35xx-h.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h700-anbernic-rg35xx-plus.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h700-anbernic-rg35xx-sp.dtb

16
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
View File

@ -263,6 +263,14 @@
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&ths 1>;
trips {
gpu0_crit: gpu0-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
};
};
};
gpu1_thermal: gpu1-thermal {
@ -270,6 +278,14 @@
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&ths 2>;
trips {
gpu1_crit: gpu1-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
};
};
};
};

2
arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
View File

@ -914,6 +914,8 @@
dmas = <&dma 48>, <&dma 48>;
dma-names = "rx", "tx";
resets = <&r_ccu RST_R_APB2_I2C>;
pinctrl-names = "default";
pinctrl-0 = <&r_i2c_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;

27
arch/arm64/boot/dts/allwinner/sun50i-h700-anbernic-rg35xx-2024.dts
View File

@ -21,6 +21,12 @@
serial0 = &uart0;
};
battery: battery {
compatible = "simple-battery";
constant-charge-current-max-microamp = <1024000>;
voltage-max-design-microvolt = <4200000>;
};
chosen {
stdout-path = "serial0:115200n8";
};
@ -201,12 +207,12 @@
vcc-pi-supply = <&reg_cldo3>;
};
&r_rsb {
&r_i2c {
status = "okay";
axp717: pmic@3a3 {
axp717: pmic@34 {
compatible = "x-powers,axp717";
reg = <0x3a3>;
reg = <0x34>;
interrupt-controller;
#interrupt-cells = <1>;
interrupt-parent = <&nmi_intc>;
@ -217,6 +223,16 @@
vin3-supply = <&reg_vcc5v>;
vin4-supply = <&reg_vcc5v>;
axp_adc: adc {
compatible = "x-powers,axp717-adc";
#io-channel-cells = <1>;
};
battery_power: battery-power {
compatible = "x-powers,axp717-battery-power-supply";
monitored-battery = <&battery>;
};
regulators {
reg_dcdc1: dcdc1 {
regulator-always-on;
@ -307,6 +323,11 @@
/* unused */
};
};
usb_power: usb-power {
compatible = "x-powers,axp717-usb-power-supply";
input-current-limit-microamp = <1500000>;
};
};
};

34
arch/arm64/boot/dts/allwinner/sun50i-h700-anbernic-rg35xx-sp.dts Normal file
View File

@ -0,0 +1,34 @@
// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
/*
* Copyright (C) 2024 Ryan Walklin <ryan@testtoast.com>.
* Copyright (C) 2024 Chris Morgan <macroalpha82@gmail.com>.
*/
#include <dt-bindings/input/gpio-keys.h>
#include "sun50i-h700-anbernic-rg35xx-plus.dts"
/ {
model = "Anbernic RG35XX SP";
compatible = "anbernic,rg35xx-sp", "allwinner,sun50i-h700";
gpio-keys-lid {
compatible = "gpio-keys";
lid-switch {
label = "Lid Switch";
gpios = <&pio 4 7 GPIO_ACTIVE_LOW>; /* PE7 */
linux,can-disable;
linux,code = <SW_LID>;
linux,input-type = <EV_SW>;
wakeup-event-action = <EV_ACT_DEASSERTED>;
wakeup-source;
};
};
};
&r_i2c {
rtc_ext: rtc@51 {
compatible = "nxp,pcf8563";
reg = <0x51>;
};
};