Commit 27661070 authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents 28705661 bea8754e

arch/arm/boot/dts/pxa300-raumfeld-common.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -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);

	};

arch/arm/boot/dts/pxa300-raumfeld-controller.dts

+20 −1
Original line number Diff line number Diff line
@@ -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	*/

arch/arm/boot/dts/pxa300-raumfeld-speaker-one.dts

+3 −0
Original line number Diff line number Diff line
@@ -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;

	};

};

arch/arm/boot/dts/pxa3xx.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -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:

CRA Git | Maintained and supported by SUSTech CRA and CCSE