Skip to content

Commit b7d84b5

Browse files
committed
sycn with ti changes
Signed-off-by: Robert Nelson <[email protected]>
1 parent 96d6978 commit b7d84b5

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,8 @@
808808
#define SW_LINEIN_INSERT 0x0d /* set = inserted */
809809
#define SW_MUTE_DEVICE 0x0e /* set = device disabled */
810810
#define SW_PEN_INSERTED 0x0f /* set = pen inserted */
811-
#define SW_MAX 0x0f
811+
#define SW_MACHINE_COVER 0x10 /* set = cover closed */
812+
#define SW_MAX 0x10
812813
#define SW_CNT (SW_MAX+1)
813814

814815
/*

src/arm/am33xx-l4.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -845,6 +845,11 @@
845845
clocks = <&pruss_iepclk_mux>;
846846
};
847847

848+
pruss_ecap: ecap@30000 {
849+
compatible = "ti,pruss-ecap";
850+
reg = <0x30000 0x60>;
851+
};
852+
848853
pruss_uart: serial@28000 {
849854
compatible = "ti,pruss-uart";
850855
reg = <0x28000 0x38>;

src/arm/dra7-pruss.dtsi

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@
5959
clocks = <&pruss1_iepclk_mux>;
6060
};
6161

62+
pruss1_ecap: ecap@30000 {
63+
compatible = "ti,pruss-ecap";
64+
reg = <0x30000 0x60>;
65+
};
66+
6267
pruss1_mii_rt: mii-rt@32000 {
6368
compatible = "syscon";
6469
reg = <0x32000 0x58>;
@@ -174,6 +179,11 @@
174179
clocks = <&pruss2_iepclk_mux>;
175180
};
176181

182+
pruss2_ecap: ecap@30000 {
183+
compatible = "ti,pruss-ecap";
184+
reg = <0x30000 0x60>;
185+
};
186+
177187
pruss2_mii_rt: mii-rt@32000 {
178188
compatible = "syscon";
179189
reg = <0x32000 0x58>;

0 commit comments

Comments
 (0)