Skip to content

Commit 07e7d2b

Browse files
RobertCNelsonRobertCNelson
committed
sync with 5.4.x: for AM33XX_PADCONF*
Signed-off-by: Robert Nelson <[email protected]>
1 parent 43b13cf commit 07e7d2b

21 files changed

+534
-364
lines changed

‎include/dt-bindings/input/linux-event-codes.h

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,7 @@
407407
#define BTN_TOOL_MOUSE 0x146
408408
#define BTN_TOOL_LENS 0x147
409409
#define BTN_TOOL_QUINTTAP 0x148 /* Five fingers on trackpad */
410+
#define BTN_STYLUS3 0x149
410411
#define BTN_TOUCH 0x14a
411412
#define BTN_STYLUS 0x14b
412413
#define BTN_STYLUS2 0x14c
@@ -438,10 +439,12 @@
438439
#define KEY_TITLE 0x171
439440
#define KEY_SUBTITLE 0x172
440441
#define KEY_ANGLE 0x173
441-
#define KEY_ZOOM 0x174
442+
#define KEY_FULL_SCREEN 0x174 /* AC View Toggle */
443+
#define KEY_ZOOM KEY_FULL_SCREEN
442444
#define KEY_MODE 0x175
443445
#define KEY_KEYBOARD 0x176
444-
#define KEY_SCREEN 0x177
446+
#define KEY_ASPECT_RATIO 0x177 /* HUTRR37: Aspect */
447+
#define KEY_SCREEN KEY_ASPECT_RATIO
445448
#define KEY_PC 0x178 /* Media Select Computer */
446449
#define KEY_TV 0x179 /* Media Select TV */
447450
#define KEY_TV2 0x17a /* Media Select Cable */
@@ -593,6 +596,7 @@
593596
#define BTN_DPAD_RIGHT 0x223
594597

595598
#define KEY_ALS_TOGGLE 0x230 /* Ambient light sensor */
599+
#define KEY_ROTATE_LOCK_TOGGLE 0x231 /* Display rotation lock */
596600

597601
#define KEY_BUTTONCONFIG 0x240 /* AL Button Configuration */
598602
#define KEY_TASKMANAGER 0x241 /* AL Task/Project Manager */
@@ -602,6 +606,7 @@
602606
#define KEY_SCREENSAVER 0x245 /* AL Screen Saver */
603607
#define KEY_VOICECOMMAND 0x246 /* Listening Voice Command */
604608
#define KEY_ASSISTANT 0x247 /* AL Context-aware desktop assistant */
609+
#define KEY_KBD_LAYOUT_NEXT 0x248 /* AC Next Keyboard Layout Select */
605610

606611
#define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */
607612
#define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */
@@ -706,6 +711,16 @@
706711
#define REL_DIAL 0x07
707712
#define REL_WHEEL 0x08
708713
#define REL_MISC 0x09
714+
/*
715+
* 0x0a is reserved and should not be used in input drivers.
716+
* It was used by HID as REL_MISC+1 and userspace needs to detect if
717+
* the next REL_* event is correct or is just REL_MISC + n.
718+
* We define here REL_RESERVED so userspace can rely on it and detect
719+
* the situation described above.
720+
*/
721+
#define REL_RESERVED 0x0a
722+
#define REL_WHEEL_HI_RES 0x0b
723+
#define REL_HWHEEL_HI_RES 0x0c
709724
#define REL_MAX 0x0f
710725
#define REL_CNT (REL_MAX+1)
711726

‎include/dt-bindings/interrupt-controller/arm-gic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* SPDX-License-Identifier: GPL-2.0 */
1+
/* SPDX-License-Identifier: GPL-2.0 OR MIT */
22
/*
33
* This header provides constants for the ARM GIC.
44
*/

‎include/dt-bindings/interrupt-controller/irq.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* SPDX-License-Identifier: GPL-2.0 */
1+
/* SPDX-License-Identifier: GPL-2.0 OR MIT */
22
/*
33
* This header provides constants for most IRQ bindings.
44
*

‎include/dt-bindings/media/omap3-isp.h

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1+
/* SPDX-License-Identifier: GPL-2.0-only */
12
/*
23
* include/dt-bindings/media/omap3-isp.h
34
*
45
* Copyright (C) 2015 Sakari Ailus
5-
*
6-
* This program is free software; you can redistribute it and/or
7-
* modify it under the terms of the GNU General Public License
8-
* version 2 as published by the Free Software Foundation.
9-
*
10-
* This program is distributed in the hope that it will be useful, but
11-
* WITHOUT ANY WARRANTY; without even the implied warranty of
12-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13-
* General Public License for more details.
146
*/
157

168
#ifndef __DT_BINDINGS_OMAP3_ISP_H__

‎include/dt-bindings/pinctrl/am33xx.h

Lines changed: 129 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,133 @@
4040
#undef PIN_OFF_INPUT_PULLDOWN
4141
#undef PIN_OFF_WAKEUPENABLE
4242

43-
#endif
43+
#define AM335X_PIN_OFFSET_MIN 0x0800U
44+
45+
#define AM335X_PIN_GPMC_AD0 0x800
46+
#define AM335X_PIN_GPMC_AD1 0x804
47+
#define AM335X_PIN_GPMC_AD2 0x808
48+
#define AM335X_PIN_GPMC_AD3 0x80c
49+
#define AM335X_PIN_GPMC_AD4 0x810
50+
#define AM335X_PIN_GPMC_AD5 0x814
51+
#define AM335X_PIN_GPMC_AD6 0x818
52+
#define AM335X_PIN_GPMC_AD7 0x81c
53+
#define AM335X_PIN_GPMC_AD8 0x820
54+
#define AM335X_PIN_GPMC_AD9 0x824
55+
#define AM335X_PIN_GPMC_AD10 0x828
56+
#define AM335X_PIN_GPMC_AD11 0x82c
57+
#define AM335X_PIN_GPMC_AD12 0x830
58+
#define AM335X_PIN_GPMC_AD13 0x834
59+
#define AM335X_PIN_GPMC_AD14 0x838
60+
#define AM335X_PIN_GPMC_AD15 0x83c
61+
#define AM335X_PIN_GPMC_A0 0x840
62+
#define AM335X_PIN_GPMC_A1 0x844
63+
#define AM335X_PIN_GPMC_A2 0x848
64+
#define AM335X_PIN_GPMC_A3 0x84c
65+
#define AM335X_PIN_GPMC_A4 0x850
66+
#define AM335X_PIN_GPMC_A5 0x854
67+
#define AM335X_PIN_GPMC_A6 0x858
68+
#define AM335X_PIN_GPMC_A7 0x85c
69+
#define AM335X_PIN_GPMC_A8 0x860
70+
#define AM335X_PIN_GPMC_A9 0x864
71+
#define AM335X_PIN_GPMC_A10 0x868
72+
#define AM335X_PIN_GPMC_A11 0x86c
73+
#define AM335X_PIN_GPMC_WAIT0 0x870
74+
#define AM335X_PIN_GPMC_WPN 0x874
75+
#define AM335X_PIN_GPMC_BEN1 0x878
76+
#define AM335X_PIN_GPMC_CSN0 0x87c
77+
#define AM335X_PIN_GPMC_CSN1 0x880
78+
#define AM335X_PIN_GPMC_CSN2 0x884
79+
#define AM335X_PIN_GPMC_CSN3 0x888
80+
#define AM335X_PIN_GPMC_CLK 0x88c
81+
#define AM335X_PIN_GPMC_ADVN_ALE 0x890
82+
#define AM335X_PIN_GPMC_OEN_REN 0x894
83+
#define AM335X_PIN_GPMC_WEN 0x898
84+
#define AM335X_PIN_GPMC_BEN0_CLE 0x89c
85+
#define AM335X_PIN_LCD_DATA0 0x8a0
86+
#define AM335X_PIN_LCD_DATA1 0x8a4
87+
#define AM335X_PIN_LCD_DATA2 0x8a8
88+
#define AM335X_PIN_LCD_DATA3 0x8ac
89+
#define AM335X_PIN_LCD_DATA4 0x8b0
90+
#define AM335X_PIN_LCD_DATA5 0x8b4
91+
#define AM335X_PIN_LCD_DATA6 0x8b8
92+
#define AM335X_PIN_LCD_DATA7 0x8bc
93+
#define AM335X_PIN_LCD_DATA8 0x8c0
94+
#define AM335X_PIN_LCD_DATA9 0x8c4
95+
#define AM335X_PIN_LCD_DATA10 0x8c8
96+
#define AM335X_PIN_LCD_DATA11 0x8cc
97+
#define AM335X_PIN_LCD_DATA12 0x8d0
98+
#define AM335X_PIN_LCD_DATA13 0x8d4
99+
#define AM335X_PIN_LCD_DATA14 0x8d8
100+
#define AM335X_PIN_LCD_DATA15 0x8dc
101+
#define AM335X_PIN_LCD_VSYNC 0x8e0
102+
#define AM335X_PIN_LCD_HSYNC 0x8e4
103+
#define AM335X_PIN_LCD_PCLK 0x8e8
104+
#define AM335X_PIN_LCD_AC_BIAS_EN 0x8ec
105+
#define AM335X_PIN_MMC0_DAT3 0x8f0
106+
#define AM335X_PIN_MMC0_DAT2 0x8f4
107+
#define AM335X_PIN_MMC0_DAT1 0x8f8
108+
#define AM335X_PIN_MMC0_DAT0 0x8fc
109+
#define AM335X_PIN_MMC0_CLK 0x900
110+
#define AM335X_PIN_MMC0_CMD 0x904
111+
#define AM335X_PIN_MII1_COL 0x908
112+
#define AM335X_PIN_MII1_CRS 0x90c
113+
#define AM335X_PIN_MII1_RX_ER 0x910
114+
#define AM335X_PIN_MII1_TX_EN 0x914
115+
#define AM335X_PIN_MII1_RX_DV 0x918
116+
#define AM335X_PIN_MII1_TXD3 0x91c
117+
#define AM335X_PIN_MII1_TXD2 0x920
118+
#define AM335X_PIN_MII1_TXD1 0x924
119+
#define AM335X_PIN_MII1_TXD0 0x928
120+
#define AM335X_PIN_MII1_TX_CLK 0x92c
121+
#define AM335X_PIN_MII1_RX_CLK 0x930
122+
#define AM335X_PIN_MII1_RXD3 0x934
123+
#define AM335X_PIN_MII1_RXD2 0x938
124+
#define AM335X_PIN_MII1_RXD1 0x93c
125+
#define AM335X_PIN_MII1_RXD0 0x940
126+
#define AM335X_PIN_RMII1_REF_CLK 0x944
127+
#define AM335X_PIN_MDIO 0x948
128+
#define AM335X_PIN_MDC 0x94c
129+
#define AM335X_PIN_SPI0_SCLK 0x950
130+
#define AM335X_PIN_SPI0_D0 0x954
131+
#define AM335X_PIN_SPI0_D1 0x958
132+
#define AM335X_PIN_SPI0_CS0 0x95c
133+
#define AM335X_PIN_SPI0_CS1 0x960
134+
#define AM335X_PIN_ECAP0_IN_PWM0_OUT 0x964
135+
#define AM335X_PIN_UART0_CTSN 0x968
136+
#define AM335X_PIN_UART0_RTSN 0x96c
137+
#define AM335X_PIN_UART0_RXD 0x970
138+
#define AM335X_PIN_UART0_TXD 0x974
139+
#define AM335X_PIN_UART1_CTSN 0x978
140+
#define AM335X_PIN_UART1_RTSN 0x97c
141+
#define AM335X_PIN_UART1_RXD 0x980
142+
#define AM335X_PIN_UART1_TXD 0x984
143+
#define AM335X_PIN_I2C0_SDA 0x988
144+
#define AM335X_PIN_I2C0_SCL 0x98c
145+
#define AM335X_PIN_MCASP0_ACLKX 0x990
146+
#define AM335X_PIN_MCASP0_FSX 0x994
147+
#define AM335X_PIN_MCASP0_AXR0 0x998
148+
#define AM335X_PIN_MCASP0_AHCLKR 0x99c
149+
#define AM335X_PIN_MCASP0_ACLKR 0x9a0
150+
#define AM335X_PIN_MCASP0_FSR 0x9a4
151+
#define AM335X_PIN_MCASP0_AXR1 0x9a8
152+
#define AM335X_PIN_MCASP0_AHCLKX 0x9ac
153+
#define AM335X_PIN_XDMA_EVENT_INTR0 0x9b0
154+
#define AM335X_PIN_XDMA_EVENT_INTR1 0x9b4
155+
#define AM335X_PIN_WARMRSTN 0x9b8
156+
#define AM335X_PIN_NNMI 0x9c0
157+
#define AM335X_PIN_TMS 0x9d0
158+
#define AM335X_PIN_TDI 0x9d4
159+
#define AM335X_PIN_TDO 0x9d8
160+
#define AM335X_PIN_TCK 0x9dc
161+
#define AM335X_PIN_TRSTN 0x9e0
162+
#define AM335X_PIN_EMU0 0x9e4
163+
#define AM335X_PIN_EMU1 0x9e8
164+
#define AM335X_PIN_RTC_PWRONRSTN 0x9f8
165+
#define AM335X_PIN_PMIC_POWER_EN 0x9fc
166+
#define AM335X_PIN_EXT_WAKEUP 0xa00
167+
#define AM335X_PIN_USB0_DRVVBUS 0xa1c
168+
#define AM335X_PIN_USB1_DRVVBUS 0xa34
44169

170+
#define AM335X_PIN_OFFSET_MAX 0x0a34U
171+
172+
#endif

‎include/dt-bindings/pinctrl/dra.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1+
/* SPDX-License-Identifier: GPL-2.0-only */
12
/*
23
* This header provides constants for DRA pinctrl bindings.
34
*
45
* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
56
* Author: Rajendra Nayak <[email protected]>
6-
*
7-
* This program is free software; you can redistribute it and/or modify
8-
* it under the terms of the GNU General Public License version 2 as
9-
* published by the Free Software Foundation.
107
*/
118

129
#ifndef _DT_BINDINGS_PINCTRL_DRA_H

‎include/dt-bindings/pinctrl/omap.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
#define DM814X_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
6666
#define DM816X_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
6767
#define AM33XX_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
68+
#define AM33XX_PADCONF(pa, dir, mux) OMAP_IOPAD_OFFSET((pa), 0x0800) ((dir) | (mux))
6869

6970
/*
7071
* Macros to allow using the offset from the padconf physical address

‎include/dt-bindings/thermal/thermal.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1+
/* SPDX-License-Identifier: GPL-2.0-only */
12
/*
23
* This header provides constants for most thermal bindings.
34
*
45
* Copyright (C) 2013 Texas Instruments
56
* Eduardo Valentin <[email protected]>
6-
*
7-
* GPLv2 only
87
*/
98

109
#ifndef _DT_BINDINGS_THERMAL_THERMAL_H

‎src/arm/am335x-abbbi.dts

Lines changed: 32 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -43,52 +43,36 @@
4343
&am33xx_pinmux {
4444
adi_hdmi_bbbi_pins: adi_hdmi_bbbi_pins {
4545
pinctrl-single,pins = <
46-
AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr0 */
47-
AM33XX_IOPAD(0x8a0, PIN_OUTPUT | MUX_MODE0) /* lcd_data0.lcd_data0 */
48-
AM33XX_IOPAD(0x8a4, PIN_OUTPUT | MUX_MODE0) /* lcd_data1.lcd_data1 */
49-
AM33XX_IOPAD(0x8a8, PIN_OUTPUT | MUX_MODE0) /* lcd_data2.lcd_data2 */
50-
AM33XX_IOPAD(0x8ac, PIN_OUTPUT | MUX_MODE0) /* lcd_data3.lcd_data3 */
51-
AM33XX_IOPAD(0x8b0, PIN_OUTPUT | MUX_MODE0) /* lcd_data4.lcd_data4 */
52-
AM33XX_IOPAD(0x8b4, PIN_OUTPUT | MUX_MODE0) /* lcd_data5.lcd_data5 */
53-
AM33XX_IOPAD(0x8b8, PIN_OUTPUT | MUX_MODE0) /* lcd_data6.lcd_data6 */
54-
AM33XX_IOPAD(0x8bc, PIN_OUTPUT | MUX_MODE0) /* lcd_data7.lcd_data7 */
55-
AM33XX_IOPAD(0x8c0, PIN_OUTPUT | MUX_MODE0) /* lcd_data8.lcd_data8 */
56-
AM33XX_IOPAD(0x8c4, PIN_OUTPUT | MUX_MODE0) /* lcd_data9.lcd_data9 */
57-
AM33XX_IOPAD(0x8c8, PIN_OUTPUT | MUX_MODE0) /* lcd_data10.lcd_data10 */
58-
AM33XX_IOPAD(0x8cc, PIN_OUTPUT | MUX_MODE0) /* lcd_data11.lcd_data11 */
59-
AM33XX_IOPAD(0x8d0, PIN_OUTPUT | MUX_MODE0) /* lcd_data12.lcd_data12 */
60-
AM33XX_IOPAD(0x8d4, PIN_OUTPUT | MUX_MODE0) /* lcd_data13.lcd_data13 */
61-
AM33XX_IOPAD(0x8d8, PIN_OUTPUT | MUX_MODE0) /* lcd_data14.lcd_data14 */
62-
AM33XX_IOPAD(0x8dc, PIN_OUTPUT | MUX_MODE0) /* lcd_data15.lcd_data15 */
63-
AM33XX_IOPAD(0x8e0, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_vsync.lcd_vsync */
64-
AM33XX_IOPAD(0x8e4, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_hsync.lcd_hsync */
65-
AM33XX_IOPAD(0x8e8, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_pclk.lcd_pclk */
66-
AM33XX_IOPAD(0x8ec, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_ac_bias_en.lcd_ac_bias_en */
67-
>;
68-
};
69-
adi_hdmi_bbbi_off_pins: adi_hdmi_bbbi_off_pins {
70-
pinctrl-single,pins = <
71-
AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr0 */
46+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA0, PIN_OUTPUT, MUX_MODE0)
47+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA1, PIN_OUTPUT, MUX_MODE0)
48+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA2, PIN_OUTPUT, MUX_MODE0)
49+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA3, PIN_OUTPUT, MUX_MODE0)
50+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA4, PIN_OUTPUT, MUX_MODE0)
51+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA5, PIN_OUTPUT, MUX_MODE0)
52+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA6, PIN_OUTPUT, MUX_MODE0)
53+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA7, PIN_OUTPUT, MUX_MODE0)
54+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA8, PIN_OUTPUT, MUX_MODE0)
55+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA9, PIN_OUTPUT, MUX_MODE0)
56+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA10, PIN_OUTPUT, MUX_MODE0)
57+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA11, PIN_OUTPUT, MUX_MODE0)
58+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA12, PIN_OUTPUT, MUX_MODE0)
59+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA13, PIN_OUTPUT, MUX_MODE0)
60+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA14, PIN_OUTPUT, MUX_MODE0)
61+
AM33XX_PADCONF(AM335X_PIN_LCD_DATA15, PIN_OUTPUT, MUX_MODE0)
62+
AM33XX_PADCONF(AM335X_PIN_LCD_VSYNC, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
63+
AM33XX_PADCONF(AM335X_PIN_LCD_HSYNC, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
64+
AM33XX_PADCONF(AM335X_PIN_LCD_PCLK, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
65+
AM33XX_PADCONF(AM335X_PIN_LCD_AC_BIAS_EN, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
7266
>;
7367
};
7468

7569
mcasp0_pins: mcasp0_pins {
7670
pinctrl-single,pins = <
77-
0x1ac (PIN_INPUT_PULLUP | MUX_MODE0) /* mcasp0_ahclkx.mcasp0_ahclkx */
78-
0x19c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mcasp0_ahclkr.mcasp0_axr2 */
79-
0x194 (PIN_OUTPUT_PULLUP | MUX_MODE0) /* mcasp0_fsx.mcasp0_fsx */
80-
0x190 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp0_aclkx.mcasp0_aclkx */
81-
0x06c (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a11.GPIO1_27 */
82-
>;
83-
};
84-
85-
mcasp0_pins_sleep: mcasp0_pins_sleep {
86-
pinctrl-single,pins = <
87-
0x1ac (PIN_INPUT_PULLDOWN | MUX_MODE7) /* mcasp0_ahclkx.mcasp0_ahclkx */
88-
0x19c (PIN_INPUT_PULLDOWN | MUX_MODE7) /* mcasp0_ahclkr.mcasp0_axr2 */
89-
0x194 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* mcasp0_fsx.mcasp0_fsx */
90-
0x190 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* mcasp0_aclkx.mcasp0_aclkx */
91-
0x06c (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_a11.GPIO1_27 */
71+
AM33XX_PADCONF(AM335X_PIN_MCASP0_AHCLKX, PIN_INPUT_PULLUP, MUX_MODE0) /* mcasp0_ahcklx.mcasp0_ahclkx */
72+
AM33XX_PADCONF(AM335X_PIN_MCASP0_AHCLKR, PIN_OUTPUT_PULLDOWN, MUX_MODE2) /* mcasp0_ahclkr.mcasp0_axr2*/
73+
AM33XX_PADCONF(AM335X_PIN_MCASP0_FSX, PIN_OUTPUT_PULLUP, MUX_MODE0)
74+
AM33XX_PADCONF(AM335X_PIN_MCASP0_ACLKX, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
75+
AM33XX_PADCONF(AM335X_PIN_GPMC_A11, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* gpmc_a11.GPIO1_27 */
9276
>;
9377
};
9478
};
@@ -106,9 +90,9 @@
10690
adv7511w {
10791
compatible = "adi,adv7511w";
10892
reg = <0x39>;
109-
pinctrl-names = "default", "off";
93+
94+
pinctrl-names = "default";
11095
pinctrl-0 = <&adi_hdmi_bbbi_pins>;
111-
pinctrl-1 = <&adi_hdmi_bbbi_off_pins>;
11296

11397
port {
11498
hdmi_0: endpoint@0 {
@@ -118,10 +102,13 @@
118102
};
119103
};
120104

105+
&rtc {
106+
system-power-controller;
107+
};
108+
121109
&mcasp0 {
122-
pinctrl-names = "default", "sleep";
110+
pinctrl-names = "default";
123111
pinctrl-0 = <&mcasp0_pins>;
124-
pinctrl-1 = <&mcasp0_pins_sleep>;
125112
status = "okay";
126113
op-mode = <0>; /* MCASP_IIS_MODE */
127114
tdm-slots = <2>;
@@ -162,7 +149,3 @@
162149
clock-names = "mclk";
163150
};
164151
};
165-
166-
&rtc {
167-
system-power-controller;
168-
};

0 commit comments

Comments
 (0)