UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Ux500 DTS updates for the v5.18 kernel cycle: 

- Add battery thermal zones so we can monitor the battery temperature
 - Enable charging options on AB8505
 - Fix up all the AB8500 and AB8505 nodes in accordance with the new
   schema.
 - Fix the mounting matrix for the Janice phone.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEElDRnuGcz/wPCXQWMQRCzN7AZXXMFAmIG2fwACgkQQRCzN7AZ
 XXOBsg//YA3N12II2lxCRHriTdz6L5jAUdArHMMgLNTLbNJAHLIgcGDDH2WwUTDH
 /Q+TNUEeQVSXbm5bflp4+SxX5OCkAWDNZVt1/MegoIotfDv7fjN0JwwPNJeQX61Y
 c/DH9sgVEXv/iS1kt8GGzlpnyg60G7w8mCQeEOQ0YIjJwkxk38zqMK9qzTrTgcFB
 XS9OPjCbBp4HEGOltVnQjbtiCEVU1N4yrwLYmkP+MF1Bs+/WDcfukj9gZGgJ9zGu
 ljivN6smB0BJ7b5D9Wf6CvYOPVYfe2gxhwOCb4Y8xIiPUXN6KrbdetsbwMdqz0AV
 Qwy8TiV6XFDL383mVcISLaRN64kEyfpMWeJPSTLNeNRJiKTrn/FiLb5k1+98lSZi
 HWjp5tnmLsQ7o56VPbx6vdxlimnJ/abyWwek3tlQDPUkHmj+4IxPBCSpLhAoQ59I
 z86af1wQ2Ggkn9CeXusoX8RDZZhK1C20nqi/4fWPv6G+r2z7YaVse2FcJhAlc8pE
 Vos/6pSKy8n+gqtBr6uCLbh8xXQo/0/HBddRpYZBTTWPyc+hejBdviXv+HBeJ0An
 ShuyX50yCbpCZknyBzQeNdDW7H9RSDTPQ8SSVUeM+YJxy67tmNVyK7D09EpHf5nd
 5SaLQEkWK4joSawOLsb8VjGRTaHazbm0SsBAYZPZFCVhk5JmOLM=
 =h414
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmIY6K4ACgkQmmx57+YA
 GNl9ug/+Jm5Ms73+GTKcS6/oF2z7ASbF8mGk5H11qk1RTAZUrJfSgdnsCWmDNmuV
 fG8vHqtPVTtlYuaBMTc85bkdSdQFLuQJ9naK+SA1R7eHDjeMVgnkVyiHDOmGNrb6
 ubELnMiXfTAQhqy0VpYaKlHYcMtgAmMsNWhXToHVyYuAppYGZuqcsvsy86TDVKYs
 yLLFHAVU/U+3725y/yqExfb3inhlrXQ4dl9qz5umKhsnONiW4f1gzOSPNATAtElV
 MN2cQb+RYPlb2Baxt/9U/nZLyK5qYZMsY3mMJmgsblC9NQ3bPsCzfEejI286oKOG
 tyJ+z5LQ8q5aCCWZRw3Joz03dzSLmW7WjFDukawoKKzK2+n4iMmzr1VFoaZ6QmKo
 IJkneaY6mK8gC44RKwr1ADQZT92X8V28VGMXrHYMV23+lYt2eM0fkGfruO2lf5Ox
 62q7SZGa/bmQFVA2it2gDt2WQZzDpyok9aSVUSudzaiAb5j6wYBM5OjcVb8oHe8o
 68vsHgtN5bv6Tehyy6WFo65Jf7sOuz9xyTESWuxLcT8jMnsL1FL+x4jhV7TxvZRH
 qC+lt3Vo1Y4YOIaM+of8dIpxp39grpnqslJ7auCSlhlM+knllslp/1NbZh+XpHjN
 x9SxkWiTCSrrgDETAPOg1E0bNl3ZOVgG2OXROySwcwpiSMmJFD4=
 =PAPT
 -----END PGP SIGNATURE-----

Merge tag 'ux500-dts-v5.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/dt

Ux500 DTS updates for the v5.18 kernel cycle:

- Add battery thermal zones so we can monitor the battery temperature
- Enable charging options on AB8505
- Fix up all the AB8500 and AB8505 nodes in accordance with the new
  schema.
- Fix the mounting matrix for the Janice phone.

* tag 'ux500-dts-v5.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: ux500: Correct Janice accel mount matrix
  ARM: dts: ux500: Update AB850[05] nodes
  ARM: dts: AB8505: Enable charging options
  ARM: dts: ux500: Add battery thermal zones and NTCs

Link: https://lore.kernel.org/r/CACRpkdaDcEqtSnWzRBnBHVweh2n=Dj3meHG9LND+K0Czb9ORGg@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-02-25 15:33:17 +01:00
parent 8e9e1aeed2 cbc72c0f27
commit 7743b59fc0
11 changed files with 203 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
arch/arm/boot/dts/ste-ab8500.dtsi
View File

@ -28,26 +28,28 @@
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller;
#interrupt-cells = <2>;
#address-cells = <1>;
#size-cells = <0>;
ab8500_clock: clock-controller {
compatible = "stericsson,ab8500-clk";
#clock-cells = <1>;
};
ab8500_gpio: ab8500-gpiocontroller {
ab8500_gpio: gpio {
compatible = "stericsson,ab8500-gpio";
gpio-controller;
#gpio-cells = <2>;
};
ab8500-rtc {
rtc {
compatible = "stericsson,ab8500-rtc";
interrupts = <17 IRQ_TYPE_LEVEL_HIGH>,
<18 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "60S", "ALARM";
};
gpadc: ab8500-gpadc {
gpadc: adc {
compatible = "stericsson,ab8500-gpadc";
interrupts = <32 IRQ_TYPE_LEVEL_HIGH>,
<39 IRQ_TYPE_LEVEL_HIGH>;
@ -120,13 +122,10 @@
};
};
ab8500_temp {
thermal {
compatible = "stericsson,abx500-temp";
interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ABX500_TEMP_WARM";
io-channels = <&gpadc 0x06>,
<&gpadc 0x07>;
io-channel-names = "aux1", "aux2";
};
ab8500_fg {
@ -212,7 +211,7 @@
monitored-battery = <&battery>;
};
ab8500_usb: ab8500_usb {
ab8500_usb: phy {
compatible = "stericsson,ab8500-usb";
interrupts = <90 IRQ_TYPE_LEVEL_HIGH>,
<96 IRQ_TYPE_LEVEL_HIGH>,
@ -236,7 +235,7 @@
#phy-cells = <0>;
};
ab8500-ponkey {
key {
compatible = "stericsson,ab8500-poweron-key";
interrupts = <6 IRQ_TYPE_LEVEL_HIGH>,
<7 IRQ_TYPE_LEVEL_HIGH>;
@ -247,29 +246,31 @@
compatible = "stericsson,ab8500-sysctrl";
};
ab8500-pwm-1 {
pwm@1 {
compatible = "stericsson,ab8500-pwm";
reg = <1>;
clocks = <&ab8500_clock AB8500_SYSCLK_INT>;
clock-names = "intclk";
#pwm-cells = <1>;
};
ab8500-pwm-2 {
pwm@2 {
compatible = "stericsson,ab8500-pwm";
reg = <2>;
clocks = <&ab8500_clock AB8500_SYSCLK_INT>;
clock-names = "intclk";
#pwm-cells = <1>;
};
ab8500-pwm-3 {
pwm@3 {
compatible = "stericsson,ab8500-pwm";
reg = <3>;
clocks = <&ab8500_clock AB8500_SYSCLK_INT>;
clock-names = "intclk";
#pwm-cells = <1>;
};
ab8500-debugfs {
compatible = "stericsson,ab8500-debug";
};
codec: ab8500-codec {
codec: codec {
compatible = "stericsson,ab8500-codec";
V-AUD-supply = <&ab8500_ldo_audio_reg>;
@ -283,7 +284,7 @@
stericsson,earpeice-cmv = <950>; /* Units in mV. */
};
ext_regulators: ab8500-ext-regulators {
ext_regulators: regulator-external {
compatible = "stericsson,ab8500-ext-regulator";
ab8500_ext1_reg: ab8500_ext1 {
@ -307,7 +308,7 @@
};
};
ab8500-regulators {
regulator {
compatible = "stericsson,ab8500-regulator";
vin-supply = <&ab8500_ext3_reg>;

34
arch/arm/boot/dts/ste-ab8505.dtsi
View File

@ -25,26 +25,28 @@
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller;
#interrupt-cells = <2>;
#address-cells = <1>;
#size-cells = <0>;
ab8500_clock: clock-controller {
compatible = "stericsson,ab8500-clk";
#clock-cells = <1>;
};
ab8505_gpio: ab8505-gpiocontroller {
ab8505_gpio: gpio {
compatible = "stericsson,ab8505-gpio";
gpio-controller;
#gpio-cells = <2>;
};
ab8500-rtc {
rtc {
compatible = "stericsson,ab8500-rtc";
interrupts = <17 IRQ_TYPE_LEVEL_HIGH>,
<18 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "60S", "ALARM";
};
gpadc: ab8500-gpadc {
gpadc: adc {
compatible = "stericsson,ab8500-gpadc";
interrupts = <39 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "SW_CONV_END";
@ -92,8 +94,13 @@
};
};
thermal {
compatible = "stericsson,abx500-temp";
interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "ABX500_TEMP_WARM";
};
ab8500_fg {
status = "disabled";
compatible = "stericsson,ab8500-fg";
interrupts = <24 IRQ_TYPE_LEVEL_HIGH>,
<8 IRQ_TYPE_LEVEL_HIGH>,
@ -111,7 +118,6 @@
};
ab8500_btemp {
status = "disabled";
compatible = "stericsson,ab8500-btemp";
interrupts = <20 IRQ_TYPE_LEVEL_HIGH>,
<80 IRQ_TYPE_LEVEL_HIGH>,
@ -131,7 +137,6 @@
};
ab8500_charger {
status = "disabled";
compatible = "stericsson,ab8500-charger";
interrupts = <10 IRQ_TYPE_LEVEL_HIGH>,
<11 IRQ_TYPE_LEVEL_HIGH>,
@ -170,12 +175,11 @@
};
ab8500_chargalg {
status = "disabled";
compatible = "stericsson,ab8500-chargalg";
monitored-battery = <&battery>;
};
ab8500_usb: ab8500_usb {
ab8500_usb: phy {
compatible = "stericsson,ab8500-usb";
interrupts = <90 IRQ_TYPE_LEVEL_HIGH>,
<96 IRQ_TYPE_LEVEL_HIGH>,
@ -199,7 +203,7 @@
#phy-cells = <0>;
};
ab8500-ponkey {
key {
compatible = "stericsson,ab8500-poweron-key";
interrupts = <6 IRQ_TYPE_LEVEL_HIGH>,
<7 IRQ_TYPE_LEVEL_HIGH>;
@ -210,17 +214,15 @@
compatible = "stericsson,ab8500-sysctrl";
};
ab8500-pwm {
pwm@1 {
compatible = "stericsson,ab8500-pwm";
reg = <1>;
clocks = <&ab8500_clock AB8500_SYSCLK_INT>;
clock-names = "intclk";
#pwm-cells = <1>;
};
ab8500-debugfs {
compatible = "stericsson,ab8500-debug";
};
codec: ab8500-codec {
codec: codec {
compatible = "stericsson,ab8500-codec";
V-AUD-supply = <&ab8500_ldo_audio_reg>;
@ -233,7 +235,7 @@
stericsson,earpeice-cmv = <950>; /* Units in mV. */
};
ab8505-regulators {
regulator {
compatible = "stericsson,ab8505-regulator";
ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {

2
arch/arm/boot/dts/ste-href-ab8500.dtsi
View File

@ -9,7 +9,7 @@
soc {
prcmu@80157000 {
ab8500 {
ab8500-gpiocontroller {
gpio {
/* Hog a few default settings */
pinctrl-names = "default";
pinctrl-0 = <&gpio2_default_mode>,

25
arch/arm/boot/dts/ste-href.dtsi
View File

@ -16,7 +16,24 @@
battery: battery {
compatible = "simple-battery";
battery-type = "lithium-ion-polymer";
thermistor-on-batctrl;
};
thermal-zones {
battery-thermal {
/* This zone will be polled by the battery temperature code */
polling-delay = <0>;
polling-delay-passive = <0>;
thermal-sensors = <&bat_therm>;
};
};
bat_therm: thermistor {
compatible = "murata,ncp18wb473";
io-channels = <&gpadc 0x02>; /* BatTemp */
pullup-uv = <1800000>;
pullup-ohm = <230000>;
pulldown-ohm = <0>;
#thermal-sensor-cells = <0>;
};
soc {
@ -219,16 +236,16 @@
prcmu@80157000 {
ab8500 {
ab8500-gpiocontroller {
gpio {
};
ab8500_usb {
phy {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&usb_a_1_default>;
pinctrl-1 = <&usb_a_1_sleep>;
};
ab8500-regulators {
regulator {
ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
regulator-name = "V-DISPLAY";
};

27
arch/arm/boot/dts/ste-snowball.dts
View File

@ -20,7 +20,24 @@
battery: battery {
compatible = "simple-battery";
battery-type = "lithium-ion-polymer";
thermistor-on-batctrl;
};
thermal-zones {
battery-thermal {
/* This zone will be polled by the battery temperature code */
polling-delay = <0>;
polling-delay-passive = <0>;
thermal-sensors = <&bat_therm>;
};
};
bat_therm: thermistor {
compatible = "murata,ncp18wb473";
io-channels = <&gpadc 0x02>; /* BatTemp */
pullup-uv = <1800000>;
pullup-ohm = <230000>;
pulldown-ohm = <0>;
#thermal-sensor-cells = <0>;
};
en_3v3_reg: en_3v3 {
@ -384,7 +401,7 @@
prcmu@80157000 {
ab8500 {
ab8500-gpiocontroller {
gpio {
/*
* AB8500 GPIOs are numbered starting from 1, so the first
* index 0 is what in the datasheet is called "GPIO1", and
@ -406,13 +423,13 @@
"PM_GPIO42"; /* AB8500 GPIO42 */
};
ab8500_usb {
phy {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&usb_a_1_default>;
pinctrl-1 = <&usb_a_1_sleep>;
};
ext_regulators: ab8500-ext-regulators {
ext_regulators: regulator-external {
ab8500_ext1_reg: ab8500_ext1 {
regulator-name = "ab8500-ext-supply1";
};
@ -426,7 +443,7 @@
};
};
ab8500-regulators {
regulator {
ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
regulator-name = "V-DISPLAY";
};

22
arch/arm/boot/dts/ste-ux500-samsung-codina.dts
View File

@ -47,6 +47,24 @@
compatible = "samsung,eb425161lu";
};
thermal-zones {
battery-thermal {
/* This zone will be polled by the battery temperature code */
polling-delay = <0>;
polling-delay-passive = <0>;
thermal-sensors = <&bat_therm>;
};
};
bat_therm: thermistor {
compatible = "samsung,1404-001221";
io-channels = <&gpadc 0x02>; /* BatTemp */
pullup-uv = <1800000>;
pullup-ohm = <230000>;
pulldown-ohm = <0>;
#thermal-sensor-cells = <0>;
};
/* TI TXS0206 level translator for 2.9 V */
sd_level_translator: regulator-gpio {
compatible = "regulator-fixed";
@ -459,13 +477,13 @@
prcmu@80157000 {
ab8500 {
ab8500_usb {
phy {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&usb_a_1_default>;
pinctrl-1 = <&usb_a_1_sleep>;
};
ab8500-regulators {
regulator {
ab8500_ldo_aux1 {
/* Used for VDD for sensors */
regulator-name = "V-SENSORS-VDD";

22
arch/arm/boot/dts/ste-ux500-samsung-gavini.dts
View File

@ -24,6 +24,24 @@
compatible = "samsung,eb585157lu";
};
thermal-zones {
battery-thermal {
/* This zone will be polled by the battery temperature code */
polling-delay = <0>;
polling-delay-passive = <0>;
thermal-sensors = <&bat_therm>;
};
};
bat_therm: thermistor {
compatible = "samsung,1404-001221";
io-channels = <&gpadc 0x02>; /* BatTemp */
pullup-uv = <1800000>;
pullup-ohm = <230000>;
pulldown-ohm = <0>;
#thermal-sensor-cells = <0>;
};
/* TI TXS0206 level translator for 2.9 V */
sd_level_translator: regulator-gpio {
compatible = "regulator-fixed";
@ -432,13 +450,13 @@
prcmu@80157000 {
ab8500 {
ab8500_usb {
phy {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&usb_a_1_default>;
pinctrl-1 = <&usb_a_1_sleep>;
};
ab8500-regulators {
regulator {
ab8500_ldo_aux1 {
/* Used for VDD for sensors */
regulator-name = "V-SENSORS-VDD";

22
arch/arm/boot/dts/ste-ux500-samsung-golden.dts
View File

@ -29,6 +29,24 @@
compatible = "samsung,eb-l1m7flu";
};
thermal-zones {
battery-thermal {
/* This zone will be polled by the battery temperature code */
polling-delay = <0>;
polling-delay-passive = <0>;
thermal-sensors = <&bat_therm>;
};
};
bat_therm: thermistor {
compatible = "samsung,1404-001221";
io-channels = <&gpadc 0x02>; /* BatTemp */
pullup-uv = <1800000>;
pullup-ohm = <230000>;
pulldown-ohm = <0>;
#thermal-sensor-cells = <0>;
};
i2c-gpio-0 {
compatible = "i2c-gpio";
sda-gpios = <&gpio2 14 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@ -280,13 +298,13 @@
prcmu@80157000 {
ab8505 {
ab8500_usb {
phy {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&usb_a_1_default>;
pinctrl-1 = <&usb_a_1_sleep>;
};
ab8505-regulators {
regulator {
ab8500_ldo_aux1 {
regulator-name = "sensor_3v";
regulator-min-microvolt = <3000000>;

24
arch/arm/boot/dts/ste-ux500-samsung-janice.dts
View File

@ -24,6 +24,24 @@
compatible = "samsung,eb535151vu";
};
thermal-zones {
battery-thermal {
/* This zone will be polled by the battery temperature code */
polling-delay = <0>;
polling-delay-passive = <0>;
thermal-sensors = <&bat_therm>;
};
};
bat_therm: thermistor {
compatible = "samsung,1404-001221";
io-channels = <&gpadc 0x02>; /* BatTemp */
pullup-uv = <1800000>;
pullup-ohm = <230000>;
pulldown-ohm = <0>;
#thermal-sensor-cells = <0>;
};
/* External LDO for eMMC LDO VMEM_3V3 controlled by GPIO6 */
ldo_3v3_reg: regulator-gpio-ldo-3v3 {
compatible = "regulator-fixed";
@ -480,13 +498,13 @@
prcmu@80157000 {
ab8500 {
ab8500_usb {
phy {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&usb_a_1_default>;
pinctrl-1 = <&usb_a_1_sleep>;
};
ab8500-regulators {
regulator {
ab8500_ldo_aux1 {
/* Used for VDD for sensors */
regulator-name = "V-SENSORS-VDD";
@ -594,7 +612,7 @@
reg = <0x08>;
mount-matrix = "0", "1", "0",
"-1", "0", "0",
"0", "0", "-1";
"0", "0", "1";
vddio-supply = <&ab8500_ldo_aux2_reg>; // 1.8V
vdd-supply = <&ab8500_ldo_aux1_reg>; // 3V
};

22
arch/arm/boot/dts/ste-ux500-samsung-kyle.dts
View File

@ -28,6 +28,24 @@
compatible = "samsung,eb425161la";
};
thermal-zones {
battery-thermal {
/* This zone will be polled by the battery temperature code */
polling-delay = <0>;
polling-delay-passive = <0>;
thermal-sensors = <&bat_therm>;
};
};
bat_therm: thermistor {
compatible = "samsung,1404-001221";
io-channels = <&gpadc 0x02>; /* BatTemp */
pullup-uv = <1800000>;
pullup-ohm = <230000>;
pulldown-ohm = <0>;
#thermal-sensor-cells = <0>;
};
/* TI TXS0206 level translator for 2.9 V */
sd_level_translator: regulator-gpio {
compatible = "regulator-fixed";
@ -301,13 +319,13 @@
prcmu@80157000 {
ab8505 {
ab8500_usb {
phy {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&usb_a_1_default>;
pinctrl-1 = <&usb_a_1_sleep>;
};
ab8505-regulators {
regulator {
ab8500_ldo_aux1 {
/* Used for VDD for sensors */
regulator-name = "AUX1";

22
arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
View File

@ -24,6 +24,24 @@
compatible = "samsung,eb485159lu";
};
thermal-zones {
battery-thermal {
/* This zone will be polled by the battery temperature code */
polling-delay = <0>;
polling-delay-passive = <0>;
thermal-sensors = <&bat_therm>;
};
};
bat_therm: thermistor {
compatible = "samsung,1404-001221";
io-channels = <&gpadc 0x02>; /* BatTemp */
pullup-uv = <1800000>;
pullup-ohm = <230000>;
pulldown-ohm = <0>;
#thermal-sensor-cells = <0>;
};
/* TI TXS0206 level translator for 2.9 V */
sd_level_translator: regulator-gpio {
compatible = "regulator-fixed";
@ -285,13 +303,13 @@
prcmu@80157000 {
ab8505 {
ab8500_usb {
phy {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&usb_a_1_default>;
pinctrl-1 = <&usb_a_1_sleep>;
};
ab8505-regulators {
regulator {
ab8500_ldo_aux1 {
/* Used for VDD for sensors */
regulator-name = "AUX1";