renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-29 15:43:59 +08:00
Code

This is the pxa devicetree changes for 5.3 cycle :

Browse Source 
- devicetree pinmux support for bias on pxa3xx
  - devicetree pinmux bias usage for raumfeld
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEExgkueSa0u8n4Ls+HA/Z63R24yxIFAl0QmYwXHHJvYmVydC5q
 YXJ6bWlrQGZyZWUuZnIACgkQA/Z63R24yxIe+w/+I0IPxGYZk+N+3n8Fc5d5kYBD
 0ppzLj2lN5FI3vRBeIZQFLhncqF4COQFtPu2v0/+eCF0P7b8s3Be6mfH1pBJr7tT
 lwDUZBBiGAYOTo+oH87opvtQFFi/sD4PhPQfYcNrFkHlob7UeuTAc9wHFWr512dW
 8Snf2bJRIsWAv7U79qdx90pLH4HGsWUnOU309nAOneWEZQ9Q2EyHsZatgu6AyFTN
 fMedFb7KTUK8hcoru576Bh68cddFxUHFGhsQLmdET5Z97yu+ZrRfvYYJ/Kqm7ZhC
 wbQo0JZVXitdUmKD78MiOBmRCJQPWBdoRm65LIPqnumO0H35mTln72SXQ/VdpwQO
 Sw4ujshfGuZDjNgVZkNT/oomCYgT3Ryq5gkK4iZXRjUnm4oNMmUmTulq74W8dlDj
 /4iFhndvA2fNLAA5FMLuuG+dXOxLvNV0zejZUfK9Omu76eYOkvgFlzwkG9rgbYST
 7Eax4aJpqV6XD7BxmUnldgKn4xcO9i7XgjkOy33JX3HDr2RFQyVuTkWPMbQaXdiL
 cEEt8ZFg1iNPzgoo810VLlJD1RNXfs2XlQkFrHh7L8l4kuUdTu9dA912BFekbjui
 AEDW4ERVqHbp7izOeRPo0nRuBU9mCeqJk13meDC8ppjk+AsHtTT/2BvnCih5SLJh
 2iBpzkFz4ZvJUoP7R40=
 =IzUY
 -----END PGP SIGNATURE-----

Merge tag 'pxa-dt-5.3' of https://github.com/rjarzmik/linux into arm/dt

This is the pxa devicetree changes for 5.3 cycle :
 - devicetree pinmux support for bias on pxa3xx
 - devicetree pinmux bias usage for raumfeld

* tag 'pxa-dt-5.3' of https://github.com/rjarzmik/linux:
  ARM: dts: pxa300-raumfeld-speaker-one: add channel output mapping for STA320
  ARM: pxa: raumfeld-common: fix comments in gpio_keys pinctrl node
  ARM: pxa: raumfeld-controller: add pinctrl for charger pins
  ARM: pxa: raumfeld-controller: fix 'dock detect' GPIO key
  ARM: pxa3xx: dts: Add defines for pinctrl-single,bias-pull{up,down}

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2019-06-25 04:50:23 -07:00
commit 276610709d
4 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/boot/dts/pxa300-raumfeld-common.dtsi
View File

@ -319,9 +319,9 @@
gpio_keys_pins: gpio-keys-pins {
pinctrl-single,pins = <
MFP_PIN_PXA300(14) MFP_AF0 /* SCK */
MFP_PIN_PXA300(115) MFP_AF0 /* MOSI */
MFP_PIN_PXA300(119) MFP_AF0 /* MISO */
MFP_PIN_PXA300(14) MFP_AF0 /* on-off */
MFP_PIN_PXA300(115) MFP_AF0 /* rescue boot */
MFP_PIN_PXA300(119) MFP_AF0 /* setup */
>;
pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_FLOAT);
};

21
arch/arm/boot/dts/pxa300-raumfeld-controller.dts
View File

@ -41,6 +41,8 @@
};
charger: charger {
pinctrl-names = "default";
pinctrl-0 = <&charger_pins>;
compatible = "gpio-charger";
charger-type = "mains";
gpios = <&gpio 101 GPIO_ACTIVE_LOW>;
@ -109,9 +111,10 @@
};
&keys {
pinctrl-0 = <&gpio_keys_pins &dock_detect_pins>;
dock-detect {
label = "dock detect";
gpios = <&gpio 116 GPIO_ACTIVE_HIGH>;
gpios = <&gpio 116 GPIO_ACTIVE_LOW>;
linux,code = <KEY_F5>;
};
};
@ -236,6 +239,22 @@
pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_FLOAT);
};
charger_pins: charger_pins {
pinctrl-single,pins = <
MFP_PIN_PXA300(31) MFP_AF0 /* PEN2 */
>;
pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_PULL_HIGH);
pinctrl-single,bias-pullup = MPF_PULL_UP;
};
dock_detect_pins: dock_detect_pins {
pinctrl-single,pins = <
MFP_PIN_PXA300(116) MFP_AF0 /* DOCK_DETECT */
>;
pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_PULL_HIGH);
pinctrl-single,bias-pullup = MPF_PULL_UP;
};
lcdc_pins: lcdc-pins {
pinctrl-single,pins = <
MFP_PIN_PXA300(54) MFP_AF1 /* LDD_0 */

3
arch/arm/boot/dts/pxa300-raumfeld-speaker-one.dts
View File

@ -116,6 +116,9 @@
st,invalid-input-detect-mute;
/* 2 (half-bridge) and 1 (full-bridge) on-board power */
st,output-conf = /bits/ 8 <0x1>;
st,ch1-output-mapping = /bits/ 8 <0>;
st,ch2-output-mapping = /bits/ 8 <1>;
st,ch3-output-mapping = /bits/ 8 <2>;
st,needs_esd_watchdog;
};
};

8
arch/arm/boot/dts/pxa3xx.dtsi
View File

@ -70,6 +70,14 @@
#define MFP_DS10X < (0x6 << 10) MFP_DSMSK >
#define MFP_DS13X < (0x7 << 10) MFP_DSMSK >
/*
* MFP bias pull mode for pins.
* Example of use: pinctrl-single,bias-pullup = MPF_PULL_UP;
*/
#define MPF_PULL_MSK (0x7 << 13)
#define MPF_PULL_DOWN < (0x5 << 13) (0x5 << 13) 0 MPF_PULL_MSK >
#define MPF_PULL_UP < (0x6 << 13) (0x6 << 13) 0 MPF_PULL_MSK >
/*
* MFP low power mode for pins.
* Example of use: