mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-10 12:53:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 4f0c2be3d1 be3a60a943
commit 514d507811
10 changed files with 61 additions and 38 deletions
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>;
};
};
};