mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-04 08:08:54 +00:00
Code Issues Releases Wiki Activity

Ux500 DTS updates:

Browse source 
- Flag the janice SPI display lines properly for the right line
   semantics.
 - Fix some errors in the Skomer regulator configuration.
 - Fix some SD card pin configurations on Skomer.
 - Assign the Skomer SD card a 300 ms power-on delay.
 - Rewrite the battery nodes to use the standard binding
   "monitored-battery" as used in the updated bindings, and
   provide the right Samsung battery compatibles for the Samsung
   phones.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEElDRnuGcz/wPCXQWMQRCzN7AZXXMFAmFoXYYACgkQQRCzN7AZ
 XXNICw//a0/qDebSV6qekbcSK+2vAERZnmyoVT9Rw3slkpd1VYU4ubefZk8rsD14
 ZfRAy4ZR9/rYuE6oNrSH4SseRzrSc8hINjYjGJPw993p9yzBt+2wcTTN0jweqjzh
 xE2sPQTxT0Z0XsDThimELwG13ew2poh4xKx2qAq/BK9vEC1qDIIgAqDjOg66OFs9
 rbXj2OStwY00HeLIgG4wQkU1KMnUEUaAiUv89rsla1f3OrFvHbBwh848AkiT36NJ
 wELGrKXSDeAfWSj+3i015BHWMJqf6tPXtSusN9//X+LNDfWGHAMLQKabsZwqruRV
 GOUxsTPPcFSQi+ZMy764hSn9xBFlEup2A8At2An4Hd0C/IFGZWNImITmfRHWJNdY
 F1tqcPLV/w3OaAToLxV8lF2VcLSg+QKj+mDRmuVZxqPpjDm3fvwHzBkkQlbvDfYw
 5R0EkGR85uQuNkQ9sPIQqBu6ybXM9KSGJ56GyPM+oIX2a8Q4Oyey95kT+S7Pp8Bk
 SBIhrnHbBgaisCe1S8M5VsnZ39BAW1upFBeOCGCV2t4l1b7n624oJxGDgv354Y89
 evxGYJOEvevEqHOF2XW4lKYpcIT3sB+b9YB8sNQGhiEaphrO4gPSdEeDOkeOnN2E
 NHrEU43I6NxzYFGGc1NWBWQ9Ga/cPK9ZIyc6mDeHZdP9P0dzeC0=
 =VZoq
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmFvO1oACgkQmmx57+YA
 GNkS4w//fs7Pf4qZUHTEtPl3g2lIlCpo4TjHu7v7ulEBmR1TEFVkqTCbCs+RLs6k
 9oQKU4+TFml/SeNg091yv8qjEA5lcfyM58Y6RQhsTrkoTFE23p9T6L1RP6qxtwg1
 SC4TX8/UlsQnN7aevcbcROX1eVwPS6ePJLagPr8BrYbauF6QgUHZ9xK1InsGnfFF
 wLLaFrscQHk6Fyyx+qRNl45UsRbBMjOaHwbw9IXtUc7C7A5ZehlVuavh93yzNOJE
 eoaqJyXEwFp77y24z9VESiCjojgDIbURWWy1/zpwPO/C7UamGeEN+LA857m+wbvW
 lg5qqTIeHfzmBXrmwQ2Cn7qkn23alGfWWA3QOyTAyW968EGU8TqkQ8N6GPsgFVgL
 r60we/ddcYhOCyEsnO3ezS2pJ61TA1nvnLkxFU8wzbrSGIU4i6UALG1k3v0L2M7W
 KvwbMusFKcDS71+XKGhGnUF3sBDX1v/IJWtmagWd/gpekJ4wQbnH+/DyL6WVWodn
 Dd7N8QNJSoKwXRLpw3WCf7m7IZujYW/YyTb0Usbn0dI4NCtTJ1M+0vnWttVEQTrk
 z9+jcJ15SOu/7OCP2jcBNtDbXsJ+8aNmQ2l/dXBr/+ZPQH3Fw+QMByshH0izSNYy
 nYIrwf9LPJx5K8/ThjVJw2CCzasHBjrEr5bCO6gwA2F3mJ/+9jE=
 =vIcZ
 -----END PGP SIGNATURE-----

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

Ux500 DTS updates:

- Flag the janice SPI display lines properly for the right line
  semantics.
- Fix some errors in the Skomer regulator configuration.
- Fix some SD card pin configurations on Skomer.
- Assign the Skomer SD card a 300 ms power-on delay.
- Rewrite the battery nodes to use the standard binding
  "monitored-battery" as used in the updated bindings, and
  provide the right Samsung battery compatibles for the Samsung
  phones.

* tag 'ux500-dts-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: ux500: Switch battery nodes to standard
  ARM: dts: ux500: Skomer eMMC needs 300 ms power on
  ARM: dts: ux500: Fix up SD card pin config
  ARM: dts: ux500: Skomer regulator fixes
  ARM: dts: ux500: Tag Janice display SPI correct

Link: https://lore.kernel.org/r/CACRpkdYf5GwRvG1Gemk4mE+aw6UnAVTY8OudwsVNPQXThHXu6g@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-10-19 23:40:40 +02:00
commit 514d507811
10 changed files with 61 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
arch/arm/boot/dts/ste-ab8500.dtsi
View file

@ -129,11 +129,6 @@ ab8500_temp {
io-channel-names = "aux1", "aux2";
};
ab8500_battery: ab8500_battery {
stericsson,battery-type = "LIPO";
thermistor-on-batctrl;
};
ab8500_fg {
compatible = "stericsson,ab8500-fg";
interrupts = <24 IRQ_TYPE_LEVEL_HIGH>,
@ -146,7 +141,7 @@ ab8500_fg {
"LOW_BAT_F",
"CC_INT_CALIB",
"CCEOC";
battery = <&ab8500_battery>;
monitored-battery = <&battery>;
io-channels = <&gpadc 0x08>;
io-channel-names = "main_bat_v";
};
@ -163,7 +158,7 @@ ab8500_btemp {
"BTEMP_HIGH",
"BTEMP_LOW_MEDIUM",
"BTEMP_MEDIUM_HIGH";
battery = <&ab8500_battery>;
monitored-battery = <&battery>;
io-channels = <&gpadc 0x02>,
<&gpadc 0x01>;
io-channel-names = "btemp_ball",
@ -200,7 +195,7 @@ ab8500_charger {
"VBUS_OVV",
"CH_WD_EXP",
"VBUS_CH_DROP_END";
battery = <&ab8500_battery>;
monitored-battery = <&battery>;
vddadc-supply = <&ab8500_ldo_tvout_reg>;
io-channels = <&gpadc 0x03>,
<&gpadc 0x0a>,
@ -214,7 +209,7 @@ ab8500_charger {
ab8500_chargalg {
compatible = "stericsson,ab8500-chargalg";
battery = <&ab8500_battery>;
monitored-battery = <&battery>;
};
ab8500_usb: ab8500_usb {

13
arch/arm/boot/dts/ste-ab8505.dtsi
View file

@ -92,11 +92,6 @@ usb_id: channel@e {
};
};
ab8500_battery: ab8500_battery {
stericsson,battery-type = "LIPO";
thermistor-on-batctrl;
};
ab8500_fg {
status = "disabled";
compatible = "stericsson,ab8500-fg";
@ -110,7 +105,7 @@ ab8500_fg {
"LOW_BAT_F",
"CC_INT_CALIB",
"CCEOC";
battery = <&ab8500_battery>;
monitored-battery = <&battery>;
io-channels = <&gpadc 0x08>;
io-channel-names = "main_bat_v";
};
@ -128,7 +123,7 @@ ab8500_btemp {
"BTEMP_HIGH",
"BTEMP_LOW_MEDIUM",
"BTEMP_MEDIUM_HIGH";
battery = <&ab8500_battery>;
monitored-battery = <&battery>;
io-channels = <&gpadc 0x02>,
<&gpadc 0x01>;
io-channel-names = "btemp_ball",
@ -166,7 +161,7 @@ ab8500_charger {
"VBUS_OVV",
"CH_WD_EXP",
"VBUS_CH_DROP_END";
battery = <&ab8500_battery>;
monitored-battery = <&battery>;
vddadc-supply = <&ab8500_ldo_adc_reg>;
io-channels = <&gpadc 0x09>,
<&gpadc 0x0b>;
@ -177,7 +172,7 @@ ab8500_charger {
ab8500_chargalg {
status = "disabled";
compatible = "stericsson,ab8500-chargalg";
battery = <&ab8500_battery>;
monitored-battery = <&battery>;
};
ab8500_usb: ab8500_usb {

6
arch/arm/boot/dts/ste-href.dtsi
View file

@ -13,6 +13,12 @@ memory {
reg = <0x00000000 0x20000000>;
};
battery: battery {
compatible = "simple-battery";
battery-type = "lithium-ion-polymer";
thermistor-on-batctrl;
};
soc {
uart@80120000 {
pinctrl-names = "default", "sleep";

6
arch/arm/boot/dts/ste-snowball.dts
View file

@ -17,6 +17,12 @@ memory {
reg = <0x00000000 0x20000000>;
};
battery: battery {
compatible = "simple-battery";
battery-type = "lithium-ion-polymer";
thermistor-on-batctrl;
};
en_3v3_reg: en_3v3 {
compatible = "regulator-fixed";
regulator-name = "en-3v3-fixed-supply";

4
arch/arm/boot/dts/ste-ux500-samsung-codina.dts
View file

@ -43,6 +43,10 @@ chosen {
stdout-path = &serial2;
};
battery: battery {
compatible = "samsung,eb425161lu";
};
/* TI TXS0206 level translator for 2.9 V */
sd_level_translator: regulator-gpio {
compatible = "regulator-fixed";

4
arch/arm/boot/dts/ste-ux500-samsung-gavini.dts
View file

@ -20,6 +20,10 @@ chosen {
stdout-path = &serial2;
};
battery: battery {
compatible = "samsung,eb585157lu";
};
/* TI TXS0206 level translator for 2.9 V */
sd_level_translator: regulator-gpio {
compatible = "regulator-fixed";

4
arch/arm/boot/dts/ste-ux500-samsung-golden.dts
View file

@ -25,6 +25,10 @@ chosen {
stdout-path = &serial2;
};
battery: battery {
compatible = "samsung,eb-l1m7flu";
};
i2c-gpio-0 {
compatible = "i2c-gpio";
sda-gpios = <&gpio2 14 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;

7
arch/arm/boot/dts/ste-ux500-samsung-janice.dts
View file

@ -20,6 +20,10 @@ chosen {
stdout-path = &serial2;
};
battery: battery {
compatible = "samsung,eb535151vu";
};
/* External LDO for eMMC LDO VMEM_3V3 controlled by GPIO6 */
ldo_3v3_reg: regulator-gpio-ldo-3v3 {
compatible = "regulator-fixed";
@ -266,6 +270,9 @@ panel@0 {
pinctrl-names = "default";
pinctrl-0 = <&panel_default_mode>;
spi-3wire;
/* TYPE 3: inverse clock polarity and phase */
spi-cpha;
spi-cpol;
port {
panel_in: endpoint {

4
arch/arm/boot/dts/ste-ux500-samsung-kyle.dts
View file

@ -24,6 +24,10 @@ chosen {
stdout-path = &serial2;
};
battery: battery {
compatible = "samsung,eb425161la";
};
/* TI TXS0206 level translator for 2.9 V */
sd_level_translator: regulator-gpio {
compatible = "regulator-fixed";

38
arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
View file

@ -20,6 +20,10 @@ chosen {
stdout-path = &serial2;
};
battery: battery {
compatible = "samsung,eb485159lu";
};
/* TI TXS0206 level translator for 2.9 V */
sd_level_translator: regulator-gpio {
compatible = "regulator-fixed";
@ -222,7 +226,9 @@ wifi@1 {
};
};
// eMMC
/*
* eMMC seems to be mostly Samsung KLM4G1YE4C "4YMD1R"
*/
mmc@80005000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
@ -232,6 +238,8 @@ mmc@80005000 {
mmc-ddr-1_8v;
no-sdio;
no-sd;
/* From datasheet page 26 figure 9: 300 ms set-up time for 4GB */
post-power-on-delay-ms = <300>;
vmmc-supply = <&ldo_3v3_reg>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&mc2_a_1_default>;
@ -292,10 +300,10 @@ ab8500_ldo_aux1 {
};
ab8500_ldo_aux2 {
/* Supplies the Cypress TMA140 touchscreen only with 3.3V */
/* Supplies the Cypress TMA140 touchscreen only with 3.0V */
regulator-name = "AUX2";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
};
ab8500_ldo_aux3 {
@ -314,9 +322,9 @@ ab8500_ldo_aux4 {
ab8500_ldo_aux5 {
regulator-name = "AUX5";
/* Intended for 1V8 for touchscreen but actually left unused */
regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <2790000>;
regulator-always-on;
};
ab8500_ldo_aux6 {
@ -444,31 +452,21 @@ panel {
};
&pinctrl {
/*
* This extends the MC0 default config to include DAT32DIR
* which is used by this machine. If we don't do this the
* SD card does not work.
*/
sdi0 {
mc0_a_1_default {
default_mux {
function = "mc0";
/* This machine uses the DAT31 pin */
groups = "mc0_a_1", "mc0dat31dir_a_1";
};
default_cfg5 {
pins = "GPIO21_AB3"; /* DAT31DIR */
ste,config = <&out_hi>;
default_cfg1 {
/* GPIO18, 19 & 20 unused so pull down */
ste,config = <&gpio_in_pd>;
};
};
};
/* The unused FBCLK needs to be pulled down on this machine */
/* This is a reset line for the eMMC */
sdi2 {
mc2_a_1_default {
default_cfg2 {
pins = "GPIO130_C8"; /* FBCLK */
ste,config = <&in_pd>;
ste,config = <&gpio_in_pd>;
};
};
};