Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ixr 28 rtc chip #6

Merged
merged 2 commits into from
Aug 7, 2023
Merged

Ixr 28 rtc chip #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6decac
Added dts for display
Aug 3, 2023
88bd7c3
Support for backup-switchover-mode.
veljkostrg Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 84 additions & 28 deletions arch/arm64/boot/dts/rockchip/rk3568-ixon-3568q.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,36 +67,17 @@

&i2c1 {
status = "okay";
hym8563: hym8563@51 {
status = "okay";
compatible = "haoyu,hym8563";
reg = <0x51>;
#clock-cells = <0>;
rtc-irq-gpio = <&gpio0 RK_PD3 IRQ_TYPE_EDGE_FALLING>;
clock-frequency = <32768>;
//clock-output-names = "xin32k";
/* rtc_int is not connected */
};

gslx680: gslx680@41 {
status = "disabled";
compatible = "gslX680";
reg = <0x41>;
screen_max_x = <800>;
screen_max_y = <1280>;
touch-gpio = <&gpio3 RK_PA3 IRQ_TYPE_LEVEL_LOW>;
reset-gpio = <&gpio3 RK_PA5 GPIO_ACTIVE_HIGH>;
flip-x = <1>;
flip-y = <0>;
swap-xy = <0>;
gsl,fw = <1>;
};

rv3028@52 {
status = "okay";
compatible = "microcrystal,rv3028";
reg = <0x52>;
trickle-resistor-ohms = <11000>;
backup-switchover-mode = <0x01>;
trickle-resistor-ohms = <3000>;
};
tpm@2e {
status = "okay";
compatible = "infineon,slb9673", "tcg,tpm-tis-i2c";
reg = <0x2e>;
};

/delete-node/ xc6130@23;
Expand Down Expand Up @@ -140,7 +121,7 @@
&uart9 {
pinctrl-names = "default";
pinctrl-0 = <&uart9m1_xfer>;
status = "okay";
status = "disabled";
};

&uart3 {
Expand All @@ -164,6 +145,72 @@
/delete-property/ spi_wk2xxx;
};

&spi3 {
status = "okay";
max-freq = <48000000>;
pinctrl-0 = <&spi3m1_pins>;
pinctrl-1 = <&spi3m1_cs0>;

#address-cells = <1>;
#size-cells = <0>;

display: display@0{
// MIPI DBI compatible driver
// This driver is used because it can ignore an illegal rotate value
// and doesn't have a set_gamma() function.
compatible = "samsung,s6d02a1";
reg = <0>; // Chip Select 0

spi-max-frequency = <32000000>; // 32MHz

pinctrl-0 = <&display_pins>;
reset-gpios = <&gpio3 RK_PA1 GPIO_ACTIVE_LOW>; // reset is active low hence the 1
dc-gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_LOW>;
led-gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_LOW>;

width = <240>;
height = <240>;
buswidth = <8>; // Most controllers use this value

// This is a hack to prevent fb_s6d02a1.c:set_var() from issuing
// command 0x36 after the init sequence has been applied and thus
// changing the config.
rotate = <1>;

// see drivers/staging/fbtft/fb_ili9341.c:init_display() for how this looks in the driver
// Command 0x36 is taken from the fb_ili9341.c:set_var() function.
init = <0x1000001
0x2000005
0x1000028
0x10000cf 0x00 0x83 0x30
0x10000ed 0x64 0x03 0x12 0x81
0x10000e8 0x85 0x01 0x79
0x10000cb 0x39 0x2c 0x00 0x34 0x02
0x10000f7 0x20
0x10000ea 0x00 0x00
0x10000c0 0x26
0x10000c1 0x11
0x10000c5 0x35 0x3e
0x10000c7 0xbe
0x100003a 0x55
0x1000036 0x28
0x10000b1 0x00 0x1b
0x1000026 0x01
0x10000f2 0x08
0x1000026 0x01
0x10000e0 0x1f 0x1a 0x18 0x0a 0x0f 0x06 0x45 0x87 0x32 0x0a 0x07 0x02 0x07 0x05 0x00
0x10000e1 0x00 0x25 0x27 0x05 0x10 0x09 0x3a 0x78 0x4d 0x05 0x18 0x0d 0x38 0x3a 0x1f
0x10000b7 0x07
0x10000b6 0x0a 0x82 0x27 0x00
0x1000011
0x2000064
0x1000029
0x2000064>;

debug = <0x4000000>; // print init commands to the kernel log
};
};

&pcie3x2 {
status = "okay";
};
Expand Down Expand Up @@ -292,7 +339,7 @@
};

&uart8 {
status = "okay";
status = "disabled";
};

&sdio_pwrseq {
Expand Down Expand Up @@ -402,4 +449,13 @@
};
};

display {
display_pins: display_pins {
rockchip,pins =
<0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,
<3 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>,
<3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up_drv_level_1>;
};
};

};
30 changes: 26 additions & 4 deletions arch/arm64/configs/ixon_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ CONFIG_BRIDGE_NF_EBTABLES=y
CONFIG_BRIDGE_EBT_BROUTE=y
CONFIG_L2TP=y
CONFIG_BRIDGE=y
CONFIG_NET_DSA=y
CONFIG_NET_SCHED=y
CONFIG_NET_SCH_HTB=y
CONFIG_NET_SCH_PRIO=y
Expand Down Expand Up @@ -256,6 +257,7 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HIDP=y
CONFIG_BT_HCIUART=y
CONFIG_BT_HCIUART_H4=y
CONFIG_MAC80211_LEDS=y
CONFIG_RFKILL=y
CONFIG_RFKILL_RK=y
CONFIG_PCI=y
Expand Down Expand Up @@ -298,6 +300,9 @@ CONFIG_NETDEVICES=y
CONFIG_DUMMY=y
CONFIG_TUN=y
CONFIG_VETH=y
CONFIG_NET_DSA_REALTEK=y
CONFIG_NET_DSA_REALTEK_RTL8365MB=y
CONFIG_NET_DSA_REALTEK_RTL8366RB=y
# CONFIG_NET_VENDOR_3COM is not set
# CONFIG_NET_VENDOR_ADAPTEC is not set
# CONFIG_NET_VENDOR_AGERE is not set
Expand Down Expand Up @@ -399,7 +404,10 @@ CONFIG_USB_NET_INT51X1=y
CONFIG_USB_IPHETH=y
CONFIG_USB_SIERRA_NET=y
# CONFIG_WLAN_VENDOR_ADMTEK is not set
# CONFIG_WLAN_VENDOR_ATH is not set
CONFIG_ATH5K_PCI=y
CONFIG_ATH10K=y
CONFIG_ATH10K_PCI=y
CONFIG_ATH10K_AHB=y
# CONFIG_WLAN_VENDOR_ATMEL is not set
# CONFIG_WLAN_VENDOR_BROADCOM is not set
# CONFIG_WLAN_VENDOR_CISCO is not set
Expand All @@ -418,7 +426,6 @@ CONFIG_WL_ROCKCHIP=y
CONFIG_WIFI_BUILD_MODULE=y
CONFIG_AP6XXX=m
CONFIG_BCMDHD_PCIE=y
CONFIG_INPUT_FF_MEMLESS=y
CONFIG_INPUT_EVDEV=y
CONFIG_KEYBOARD_ADC=y
# CONFIG_KEYBOARD_ATKBD is not set
Expand Down Expand Up @@ -494,6 +501,18 @@ CONFIG_SERIAL_8250_DW=y
CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_ROCKCHIP=y
# CONFIG_DEVPORT is not set
CONFIG_TCG_TPM=y
CONFIG_TCG_TIS=y
CONFIG_TCG_TIS_SPI=y
CONFIG_TCG_TIS_SPI_CR50=y
CONFIG_TCG_TIS_I2C_ATMEL=y
CONFIG_TCG_TIS_I2C_INFINEON=y
CONFIG_TCG_TIS_I2C_NUVOTON=y
CONFIG_TCG_ATMEL=y
CONFIG_TCG_VTPM_PROXY=y
CONFIG_TCG_FTPM_TEE=y
CONFIG_TCG_TIS_ST33ZP24_I2C=y
CONFIG_TCG_TIS_ST33ZP24_SPI=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_GPIO=y
CONFIG_I2C_RK3X=y
Expand Down Expand Up @@ -638,7 +657,6 @@ CONFIG_MALI_PLATFORM_NAME="rk"
CONFIG_MALI_CSF_SUPPORT=y
CONFIG_MALI_BIFROST_EXPERT=y
CONFIG_MALI_BIFROST_DEBUG=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_PWM=y
CONFIG_ROCKCHIP_MULTI_RGA=y
CONFIG_IEP=y
Expand Down Expand Up @@ -828,7 +846,8 @@ CONFIG_LEDS_TRIGGER_BACKLIGHT=y
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_HYM8563=y
CONFIG_RTC_DRV_RK808=y
CONFIG_RTC_DRV_RK808=n
CONFIG_RTC_DRV_RV3028=y
CONFIG_DMADEVICES=y
CONFIG_PL330_DMA=y
CONFIG_DMABUF_DEBUG=y
Expand All @@ -850,6 +869,8 @@ CONFIG_FIQ_DEBUGGER_CONSOLE=y
CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y
CONFIG_FIQ_DEBUGGER_TRUST_ZONE=y
CONFIG_RK_CONSOLE_THREAD=y
CONFIG_FB_TFT=y
CONFIG_FB_TFT_S6D02A1=y
CONFIG_COMMON_CLK_RK808=y
CONFIG_COMMON_CLK_SCMI=y
CONFIG_COMMON_CLK_PWM=y
Expand Down Expand Up @@ -958,6 +979,7 @@ CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_UTF8=y
CONFIG_UNICODE=y
CONFIG_SECURITY=y
# CONFIG_SECURITYFS is not set
CONFIG_SECURITY_NETWORK=y
CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_HARDENED_USERCOPY=y
Expand Down
Loading