Skip to content

Commit 4575d6f

Browse files
Tonymac32jamess-huang
authored andcommitted
Use Device Tree for RPi screen
1 parent e99e0b4 commit 4575d6f

File tree

6 files changed

+11
-234
lines changed

6 files changed

+11
-234
lines changed

arch/arm/boot/dts/rk3288-miniarm.dts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,17 @@
603603

604604
&i2c3 {
605605
status = "okay";
606+
607+
tinker_ft5406: tinker_ft5406@38 {
608+
compatible = "tinker_ft5406";
609+
reg = <0x38>;
610+
};
611+
612+
tinker_mcu: tinker_mcu@45 {
613+
compatible = "tinker_mcu";
614+
reg = <0x45>;
615+
};
616+
606617
};
607618

608619
&i2c4 {

arch/arm/mach-rockchip/rockchip.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,6 @@
3434
#define RK3288_GRF_SOC_CON2 0x24C
3535
#define RK3288_TIMER6_7_PHYS 0xff810000
3636

37-
static struct i2c_board_info __initdata i2c_devices_tinker_mcu[] = {
38-
{
39-
I2C_BOARD_INFO("tinker_mcu", 0x45),
40-
},
41-
};
42-
43-
static struct i2c_board_info __initdata i2c_devices_tinker_ft5406[] = {
44-
{
45-
I2C_BOARD_INFO("tinker_ft5406", 0x38),
46-
},
47-
};
48-
4937
static void __init rockchip_timer_init(void)
5038
{
5139
if (of_machine_is_compatible("rockchip,rk3288")) {
@@ -75,9 +63,6 @@ static void __init rockchip_dt_init(void)
7563
rockchip_suspend_init();
7664
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
7765
platform_device_register_simple("cpufreq-dt", 0, NULL, 0);
78-
79-
i2c_register_board_info(3, i2c_devices_tinker_mcu, ARRAY_SIZE(i2c_devices_tinker_mcu));
80-
i2c_register_board_info(3, i2c_devices_tinker_ft5406, ARRAY_SIZE(i2c_devices_tinker_ft5406));
8166
}
8267

8368
static const char * const rockchip_board_dt_compat[] = {

drivers/miniarm/dsi/Kconfig

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,6 @@ config DRM_PANEL_TOSHIBA_TC358762
77
Say Y here if you want to enable support for toshiba tc358762 bridge.
88
To compile this driver as a module, choose M here.
99

10-
config ASUS_RPI_MCU
11-
tristate "RPI MCU for ASUS"
12-
depends on DRM_ROCKCHIP && DRM_PANEL_TOSHIBA_TC358762
13-
depends on I2C
14-
select RPI_MCU
15-
help
16-
This selects support for TOSHIBA TC358762 bridge specific
17-
extensions for ASUS rpi. If you want to enable MIPI DSI
18-
on RK3288 based SoC, you should selet this option.
19-
2010
config ROCKCHIP_DW_MIPI_DSI2
2111
tristate "Rockchip specific extensions for Synopsys DW MIPI DSI"
2212
depends on DRM_ROCKCHIP

drivers/miniarm/dsi/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
obj-$(CONFIG_DRM_PANEL_TOSHIBA_TC358762) += panel-toshiba-tc358762.o
2-
#obj-$(CONFIG_ASUS_RPI_MCU) += asus_mcu.o
32
obj-$(CONFIG_ROCKCHIP_DW_MIPI_DSI2) += dw-mipi-dsi.o
43
#obj-$(CONFIG_TINKER_MCU) += tinker_mcu.o
54
obj-$(CONFIG_TOUCHSCREEN_TINKER_FT5406) += tinker_ft5406.o

drivers/miniarm/dsi/asus_mcu.c

Lines changed: 0 additions & 192 deletions
This file was deleted.

drivers/miniarm/dsi/asus_mcu.h

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)