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

STM32 DT fixes for v5.11, round 1

Browse Source 
Highlights:
 -----------
 
  -Fixes are for DHCOM/DHCOR boards:
   - Fix DRC02 uSD card detect polarity
   - use uSD card detect on DHCOM
   - Disable uSD WP on DHCOM
   - Disable TSC2004 on DRC02
   - Fix GPIO hogs on DHCOM boards
 -----BEGIN PGP SIGNATURE-----
 
 iQJRBAABCgA7FiEEctl9+nxzUSUqdELdf5rJavIecIUFAmAO7mcdHGFsZXhhbmRy
 ZS50b3JndWVAZm9zcy5zdC5jb20ACgkQf5rJavIecIWbQQ/+KmDtTdNUFeEuIMK0
 8iW8MtfAl/0OH6AsE4bPXXtaxFAJzrBaZ8eu9JjazDHPOU783i6God2idySVN0cx
 qKf5FAEea4UyXn4aJlldVX3Fx0YJm+o3Tc47JAd/foLANxXsRbmy9nzIWywHEudL
 s2cpokVE7V4s3965PZk67luENXfA2+6EtCtVK9+0TrDW82CBwKqO7SEZPau9b+dV
 q2/Q7dbsOazO66O/BpteefXhl6ONAua6I3enIt6qYfuyG4nxUzAVjfDof/yvRNLM
 +GCa5mwVAQFrbe/Yj95ENATdCK7JGUcncyxSCjzhWRYtShycVcOj+BwVXyxQbE0D
 R8vq6wqFanWqnkflmAMpjY5rM8diQfKdbllDC6Zm+w7JjlJsALNJGeiQUl0vNx8N
 XVnHPqxw/R30Jp7O9h7t8ifr17wLb+Q6k3/Z9uYiyGrbWjH6WaZ23yDFy50v6Fh/
 PsnvCaCsCzn35bB7LWgYrcoDyeldphBVLYjAWE2EFRFt7VIbLEeQG0gjQ4upe2gV
 GOXbDGJTDCRXX3xZOEqrrZnN+34690Jh5mqWl5eL9SWe146JDu0O+mupwgnUGCnJ
 ED+cG47RY0kpx3xBhr/5D0lvL2yul4Aep4c9RZlE4qH+Tc3YiVlGcOSHGlHrzDyL
 +R+XztorpO9c6yGMgQbj02grLTA=
 =5bKf
 -----END PGP SIGNATURE-----

Merge tag 'stm32-dt-for-v5.11-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into arm/fixes

STM32 DT fixes for v5.11, round 1

Highlights:
-----------

 -Fixes are for DHCOM/DHCOR boards:
  - Fix DRC02 uSD card detect polarity
  - use uSD card detect on DHCOM
  - Disable uSD WP on DHCOM
  - Disable TSC2004 on DRC02
  - Fix GPIO hogs on DHCOM boards

* tag 'stm32-dt-for-v5.11-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
  ARM: dts: stm32: Fix GPIO hog flags on DHCOM DRC02
  ARM: dts: stm32: Fix GPIO hog flags on DHCOM PicoITX
  ARM: dts: stm32: Fix GPIO hog names on DHCOM
  ARM: dts: stm32: Disable optional TSC2004 on DRC02 board
  ARM: dts: stm32: Disable WP on DHCOM uSD slot
  ARM: dts: stm32: Connect card-detect signal on DHCOM
  ARM: dts: stm32: Fix polarity of the DH DRC02 uSD card detect

Link: https://lore.kernel.org/r/b7379980-857e-736a-85d8-58e2bd300141@foss.st.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-01-26 21:23:02 +01:00
commit e6777b8d35
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/boot/dts/stm32mp15xx-dhcom-drc02.dtsi
View File

@ -33,9 +33,9 @@
* during TX anyway and that it only controls drive enable DE
* line. Hence, the RX is always enabled here.
*/
rs485-rx-en {
rs485-rx-en-hog {
gpio-hog;
gpios = <8 GPIO_ACTIVE_HIGH>;
gpios = <8 0>;
output-low;
line-name = "rs485-rx-en";
};
@ -61,9 +61,9 @@
* order to reset the Hub when USB bus is powered down, but
* so far there is no such functionality.
*/
usb-hub {
usb-hub-hog {
gpio-hog;
gpios = <2 GPIO_ACTIVE_HIGH>;
gpios = <2 0>;
output-high;
line-name = "usb-hub-reset";
};
@ -87,6 +87,12 @@
};
};
&i2c4 {
touchscreen@49 {
status = "disabled";
};
};
&i2c5 { /* TP7/TP8 */
pinctrl-names = "default";
pinctrl-0 = <&i2c5_pins_a>;
@ -104,7 +110,7 @@
* are used for on-board microSD slot instead.
*/
/delete-property/broken-cd;
cd-gpios = <&gpioi 10 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
cd-gpios = <&gpioi 10 GPIO_ACTIVE_HIGH>;
disable-wp;
};

4
arch/arm/boot/dts/stm32mp15xx-dhcom-picoitx.dtsi
View File

@ -43,9 +43,9 @@
* in order to turn on port power when USB bus is powered up, but so
* far there is no such functionality.
*/
usb-port-power {
usb-port-power-hog {
gpio-hog;
gpios = <13 GPIO_ACTIVE_LOW>;
gpios = <13 0>;
output-low;
line-name = "usb-port-power";
};

3
arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi
View File

@ -390,7 +390,8 @@
pinctrl-0 = <&sdmmc1_b4_pins_a &sdmmc1_dir_pins_a>;
pinctrl-1 = <&sdmmc1_b4_od_pins_a &sdmmc1_dir_pins_a>;
pinctrl-2 = <&sdmmc1_b4_sleep_pins_a &sdmmc1_dir_sleep_pins_a>;
broken-cd;
cd-gpios = <&gpiog 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
disable-wp;
st,sig-dir;
st,neg-edge;
st,use-ckin;