Skip to content

Commit c340b22

Browse files
hqnicolasigorpecovnik
hqnicolas
authored and
igorpecovnik
committed
rockchip rk3566: h96-TVbox: prepare i2c Leds to mainline 6.18
1 parent c6857a1 commit c340b22

File tree

4 files changed

+188
-236
lines changed

4 files changed

+188
-236
lines changed

‎patch/kernel/archive/rockchip64-6.12/dt/rk3566-h96-tvbox.dts‎

Lines changed: 47 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,13 @@
6868
linux,rc-map-name = "rc-h96-max-v56";
6969
};
7070

71-
i2c-display {
71+
i2c_aux_display: i2c-aux-display {
7272
compatible = "i2c-gpio";
7373
sda-gpios = <&gpio0 RK_PB4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
7474
scl-gpios = <&gpio0 RK_PB3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
7575
i2c-gpio,delay-us = <5>;
76+
i2c-gpio,sda-output-only;
77+
i2c-gpio,scl-output-only;
7678
#address-cells = <1>;
7779
#size-cells = <0>;
7880

@@ -85,97 +87,93 @@
8587
#size-cells = <0>;
8688
digit@0 {
8789
reg = <0>;
88-
segments = <1 3>,
89-
<1 1>,
90-
<1 2>,
91-
<1 6>,
92-
<1 4>,
93-
<1 5>,
94-
<1 0>;
90+
segments = <4 0>,
91+
<4 1>,
92+
<4 2>,
93+
<4 3>,
94+
<4 4>,
95+
<4 5>,
96+
<4 6>;
9597
};
9698
digit@1 {
9799
reg = <1>;
98-
segments = <2 3>,
99-
<2 1>,
100-
<2 2>,
101-
<2 6>,
102-
<2 4>,
103-
<2 5>,
104-
<2 0>;
105-
};
106-
digit@2 {
107-
reg = <2>;
108-
segments = <3 3>,
100+
segments = <3 0>,
109101
<3 1>,
110102
<3 2>,
111-
<3 6>,
103+
<3 3>,
112104
<3 4>,
113105
<3 5>,
114-
<3 0>;
106+
<3 6>;
107+
};
108+
digit@2 {
109+
reg = <2>;
110+
segments = <2 0>,
111+
<2 1>,
112+
<2 2>,
113+
<2 3>,
114+
<2 4>,
115+
<2 5>,
116+
<2 6>;
115117
};
116118
digit@3 {
117119
reg = <3>;
118-
segments = <4 3>,
119-
<4 1>,
120-
<4 2>,
121-
<4 6>,
122-
<4 4>,
123-
<4 5>,
124-
<4 0>;
120+
segments = <1 0>,
121+
<1 1>,
122+
<1 2>,
123+
<1 3>,
124+
<1 4>,
125+
<1 5>,
126+
<1 6>;
125127
};
126128
};
127129

128130
leds {
129131
#address-cells = <2>;
130132
#size-cells = <0>;
131-
133+
132134
led@0,0 {
133135
reg = <0 0>;
134136
function = LED_FUNCTION_ALARM;
135137
};
136-
138+
137139
led@0,1 {
138140
reg = <0 1>;
139-
function = LED_FUNCTION_USB;
140-
};
141-
142-
led@0,3 {
143-
reg = <0 3>;
144-
function = "play";
141+
function = "usb";
142+
linux,default-trigger = "usb-host";
145143
};
146-
144+
147145
led@0,2 {
148146
reg = <0 2>;
149147
function = "pause";
148+
linux,default-trigger = "mmc2";
150149
};
151-
150+
151+
led@0,3 {
152+
reg = <0 3>;
153+
function = "play";
154+
linux,default-trigger = "mmc0";
155+
};
156+
152157
led@0,4 {
153158
reg = <0 4>;
154159
function = "colon";
155160
};
156-
161+
157162
led@0,5 {
158163
reg = <0 5>;
159164
function = LED_FUNCTION_LAN;
165+
linux,default-trigger = "stmmac-0:00:link";
160166
};
161-
167+
162168
led@0,6 {
163169
reg = <0 6>;
164170
function = LED_FUNCTION_WLAN;
171+
linux,default-trigger = "mmc1";
165172
};
166173
};
167-
168174
};
169175
};
170176

171-
fddis_dev {
172-
compatible = "fddis_dev";
173-
fddis_gpio_clk = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
174-
fddis_gpio_dat = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;
175-
pinctrl-0 = <&dis_ctl_clk &dis_ctl_dat>;
176-
status = "okay";
177-
};
178-
179177
spdif_dit: spdif-dit {
180178
compatible = "linux,spdif-dit";
181179
#sound-dai-cells = <0>;
@@ -733,16 +731,6 @@
733731
rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>;
734732
};
735733
};
736-
737-
fddis_ctr {
738-
dis_ctl_clk: dis-ctl-clk {
739-
rockchip,pins = <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
740-
};
741-
742-
dis_ctl_dat: dis-ctl-dat {
743-
rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
744-
};
745-
};
746734
};
747735

748736
&pmu_io_domains {

‎patch/kernel/archive/rockchip64-6.17/dt/rk3566-h96-tvbox.dts‎

Lines changed: 47 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,13 @@
6262
linux,rc-map-name = "rc-h96-max-v56";
6363
};
6464

65-
i2c-display {
65+
i2c_aux_display: i2c-aux-display {
6666
compatible = "i2c-gpio";
6767
sda-gpios = <&gpio0 RK_PB4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
6868
scl-gpios = <&gpio0 RK_PB3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
6969
i2c-gpio,delay-us = <5>;
70+
i2c-gpio,sda-output-only;
71+
i2c-gpio,scl-output-only;
7072
#address-cells = <1>;
7173
#size-cells = <0>;
7274

@@ -79,96 +81,92 @@
7981
#size-cells = <0>;
8082
digit@0 {
8183
reg = <0>;
82-
segments = <1 3>,
83-
<1 1>,
84-
<1 2>,
85-
<1 6>,
86-
<1 4>,
87-
<1 5>,
88-
<1 0>;
84+
segments = <4 0>,
85+
<4 1>,
86+
<4 2>,
87+
<4 3>,
88+
<4 4>,
89+
<4 5>,
90+
<4 6>;
8991
};
9092
digit@1 {
9193
reg = <1>;
92-
segments = <2 3>,
93-
<2 1>,
94-
<2 2>,
95-
<2 6>,
96-
<2 4>,
97-
<2 5>,
98-
<2 0>;
99-
};
100-
digit@2 {
101-
reg = <2>;
102-
segments = <3 3>,
94+
segments = <3 0>,
10395
<3 1>,
10496
<3 2>,
105-
<3 6>,
97+
<3 3>,
10698
<3 4>,
10799
<3 5>,
108-
<3 0>;
100+
<3 6>;
101+
};
102+
digit@2 {
103+
reg = <2>;
104+
segments = <2 0>,
105+
<2 1>,
106+
<2 2>,
107+
<2 3>,
108+
<2 4>,
109+
<2 5>,
110+
<2 6>;
109111
};
110112
digit@3 {
111113
reg = <3>;
112-
segments = <4 3>,
113-
<4 1>,
114-
<4 2>,
115-
<4 6>,
116-
<4 4>,
117-
<4 5>,
118-
<4 0>;
114+
segments = <1 0>,
115+
<1 1>,
116+
<1 2>,
117+
<1 3>,
118+
<1 4>,
119+
<1 5>,
120+
<1 6>;
119121
};
120122
};
121123

122124
leds {
123125
#address-cells = <2>;
124126
#size-cells = <0>;
125-
127+
126128
led@0,0 {
127129
reg = <0 0>;
128130
function = LED_FUNCTION_ALARM;
129131
};
130-
132+
131133
led@0,1 {
132134
reg = <0 1>;
133-
function = LED_FUNCTION_USB;
134-
};
135-
136-
led@0,3 {
137-
reg = <0 3>;
138-
function = "play";
135+
function = "usb";
136+
linux,default-trigger = "usb-host";
139137
};
140-
138+
141139
led@0,2 {
142140
reg = <0 2>;
143141
function = "pause";
142+
linux,default-trigger = "mmc2";
144143
};
145-
144+
145+
led@0,3 {
146+
reg = <0 3>;
147+
function = "play";
148+
linux,default-trigger = "mmc0";
149+
};
150+
146151
led@0,4 {
147152
reg = <0 4>;
148153
function = "colon";
149154
};
150-
155+
151156
led@0,5 {
152157
reg = <0 5>;
153158
function = LED_FUNCTION_LAN;
159+
linux,default-trigger = "stmmac-0:00:link";
154160
};
155-
161+
156162
led@0,6 {
157163
reg = <0 6>;
158164
function = LED_FUNCTION_WLAN;
165+
linux,default-trigger = "mmc1";
159166
};
160167
};
161-
162168
};
163169
};
164-
165-
fddis_dev {
166-
compatible = "fddis_dev";
167-
fddis_gpio_clk = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
168-
fddis_gpio_dat = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;
169-
pinctrl-0 = <&dis_ctl_clk &dis_ctl_dat>;
170-
status = "okay";
171-
};
172170

173171
spdif_dit: spdif-dit {
174172
compatible = "linux,spdif-dit";
@@ -727,16 +725,6 @@
727725
rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>;
728726
};
729727
};
730-
731-
fddis_ctr {
732-
dis_ctl_clk: dis-ctl-clk {
733-
rockchip,pins = <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
734-
};
735-
736-
dis_ctl_dat: dis-ctl-dat {
737-
rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
738-
};
739-
};
740728
};
741729

742730
&pmu_io_domains {

0 commit comments

Comments
 (0)