diff --git a/arch/arm/boot/dts/imx28-brain-2g.dtsi b/arch/arm/boot/dts/imx28-brain-2g.dtsi deleted file mode 100644 index 3b688935bbf3..000000000000 --- a/arch/arm/boot/dts/imx28-brain-2g.dtsi +++ /dev/null @@ -1,345 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -// -// Copyright 2012 Freescale Semiconductor, Inc. - -/dts-v1/; -#include "imx28.dtsi" - -/ { - model = "SHARP Brain PW-A7200"; - compatible = "sharp,pw-a7200", "fsl,imx28"; - - memory@40000000 { - device_type = "memory"; - reg = <0x40000000 0x08000000>; - }; - - - reg_3p3v: regulator-3p3v { - compatible = "regulator-fixed"; - regulator-name = "3P3V"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - - reg_vddio_sd0: regulator-vddio-sd0 { - compatible = "regulator-fixed"; - regulator-name = "vddio-sd0"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - gpio = <&gpio3 28 0>; - }; - - reg_fec_3v3: regulator-fec-3v3 { - compatible = "regulator-fixed"; - regulator-name = "fec-3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - gpio = <&gpio2 15 0>; - }; - - reg_usb0_vbus: regulator-usb0-vbus { - compatible = "regulator-fixed"; - regulator-name = "usb0_vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - gpio = <&gpio3 9 0>; - enable-active-high; - }; - - reg_lcd_3v3: regulator-lcd-3v3 { - compatible = "regulator-fixed"; - regulator-name = "lcd-3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - gpio = <&gpio3 30 0>; - enable-active-high; - }; - - reg_can_3v3: regulator-can-3v3 { - compatible = "regulator-fixed"; - regulator-name = "can-3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - gpio = <&gpio2 13 0>; - enable-active-high; - }; - - reg_lcd_5v: regulator-lcd-5v { - compatible = "regulator-fixed"; - regulator-name = "lcd-5v"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - }; - - apb@80000000 { - apbh@80000000 { - ssp0: spi@80010000 { - compatible = "fsl,imx28-mmc"; - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_8bit_pins_a - &mmc0_cd_cfg &mmc0_sck_cfg>; - bus-width = <8>; - wp-gpios = <&gpio2 12 0>; - vmmc-supply = <®_vddio_sd0>; - status = "okay"; - }; - - ssp1: spi@80012000 { - compatible = "fsl,imx28-mmc"; - pinctrl-names = "default"; - pinctrl-0 = <&mmc1_4bit_pins_a - &mmc1_cd_cfg &mmc1_sck_cfg>; - bus-width = <4>; - status = "okay"; - }; - - ssp2: spi@80014000 { - compatible = "fsl,imx28-spi"; - pinctrl-names = "default"; - pinctrl-0 = <&slcd_pins>; - clock-frequency = <16000000>; - status = "okay"; - - slcd@0 { - reg = <0>; - compatible = "brain,st7586"; - spi-max-frequency = <16000000>; - reset-gpios = <&gpio2 18 GPIO_ACTIVE_HIGH>; - rotation = <180>; - }; - }; - - pinctrl@80018000 { - pinctrl-names = "default"; - pinctrl-0 = <&hog_pins_3v3_pullup &hog_pins_3v3_nopull &hog_pins_1v8_nopull>; - - hog_pins_3v3_pullup: hog@0 { - reg = <0>; - fsl,pinmux-ids = < - MX28_PAD_GPMI_CLE__GPIO_0_27 - >; - fsl,drive-strength = ; - fsl,voltage = ; - fsl,pull-up = ; - }; - - hog_pins_3v3_nopull: hog@1 { - reg = <1>; - fsl,pinmux-ids = < - MX28_PAD_SSP1_CMD__GPIO_2_13 - MX28_PAD_SSP1_DATA3__GPIO_2_15 - MX28_PAD_ENET0_RX_CLK__GPIO_4_13 - MX28_PAD_SSP1_SCK__GPIO_2_12 - MX28_PAD_PWM3__GPIO_3_28 - MX28_PAD_AUART2_RX__GPIO_3_8 - MX28_PAD_AUART2_TX__GPIO_3_9 - >; - fsl,drive-strength = ; - fsl,voltage = ; - fsl,pull-up = ; - }; - - hog_pins_1v8_nopull: hog@2 { - reg = <2>; - fsl,pinmux-ids = < - MX28_PAD_GPMI_ALE__GPIO_0_26 - >; - fsl,drive-strength = ; - fsl,voltage = ; - fsl,pull-up = ; - }; - - pwm_pins: pwm@0 { - reg = <0>; - fsl,pinmux-ids = < - MX28_PAD_AUART1_RX__PWM_0 - MX28_PAD_AUART1_TX__PWM_1 - MX28_PAD_PWM2__PWM_2 - MX28_PAD_PWM4__PWM_4 - MX28_PAD_SAIF1_SDATA0__GPIO_3_26 - >; - fsl,drive-strength = ; - fsl,voltage = ; - fsl,pull-up = ; - }; - - lcdif_pins: lcdif@0 { - reg = <0>; - fsl,pinmux-ids = < - MX28_PAD_LCD_D00__LCD_D0 - MX28_PAD_LCD_D01__LCD_D1 - MX28_PAD_LCD_D02__LCD_D2 - MX28_PAD_LCD_D03__LCD_D3 - MX28_PAD_LCD_D04__LCD_D4 - MX28_PAD_LCD_D05__LCD_D5 - MX28_PAD_LCD_D06__LCD_D6 - MX28_PAD_LCD_D07__LCD_D7 - MX28_PAD_LCD_D08__LCD_D8 - MX28_PAD_LCD_D09__LCD_D9 - MX28_PAD_LCD_D10__LCD_D10 - MX28_PAD_LCD_D11__LCD_D11 - MX28_PAD_LCD_D12__LCD_D12 - MX28_PAD_LCD_D13__LCD_D13 - MX28_PAD_LCD_D14__LCD_D14 - MX28_PAD_LCD_D15__LCD_D15 - MX28_PAD_LCD_RD_E__LCD_RD_E - MX28_PAD_LCD_WR_RWN__LCD_WR_RWN - MX28_PAD_LCD_RS__LCD_RS - MX28_PAD_LCD_CS__LCD_CS - MX28_PAD_LCD_RESET__LCD_RESET - >; - fsl,drive-strength = ; - fsl,voltage = ; - fsl,pull-up = ; - }; - - slcd_pins: spi2@0 { - reg = <0>; - fsl,pinmux-ids = < - MX28_PAD_SSP2_SCK__SSP2_SCK - MX28_PAD_SSP2_MOSI__SSP2_CMD - MX28_PAD_SSP2_MISO__GPIO_2_18 - MX28_PAD_SSP2_SS0__SSP2_D3 - >; - fsl,drive-strength = ; - fsl,voltage = ; - fsl,pull-up = ; - }; - }; - - brainlcd: lcdif@80030000 { - compatible = "sharp,brainlcd"; - pinctrl-names = "default"; - pinctrl-0 = <&lcdif_pins>; - status = "disabled"; - }; - }; - - apbx@80040000 { - saif0: saif@80042000 { - pinctrl-names = "default"; - pinctrl-0 = <&saif0_pins_a>; - status = "okay"; - }; - - saif1: saif@80046000 { - status = "disabled"; - }; - - lradc@80050000 { - status = "okay"; - fsl,lradc-touchscreen-wires = <4>; - fsl,ave-ctrl = <4>; - fsl,ave-delay = <2>; - fsl,settling = <10>; - }; - - mxs_rtc: rtc@80056000 { - status = "disabled"; - }; - - i2c0: i2c@80058000 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; - status = "okay"; - - sgtl5000: codec@a { - compatible = "fsl,sgtl5000"; - reg = <0x0a>; - #sound-dai-cells = <0>; - VDDA-supply = <®_3p3v>; - VDDIO-supply = <®_3p3v>; - clocks = <&saif0>; - }; - - keyboard_i2c: keyboard_i2c@28 { - status = "disabled"; - compatible = "sharp,brain-kbd-i2c"; - reg = <0x28>; - interrupt-parent = <&gpio4>; - interrupts = <2 4>; - }; - - lcd_touchscreen_i2c: sx8650@48 { - compatible = "semtech,sx8650"; - reg = <0x48>; - interrupt-parent = <&gpio3>; - interrupts = <1 2>; - }; - }; - - i2c1: i2c@8005a000 { - status = "disabled"; - }; - - pwm: pwm@80064000 { - pinctrl-names = "default"; - pinctrl-0 = <&pwm_pins>; - status = "okay"; - }; - - duart: serial@80074000 { - pinctrl-names = "default"; - pinctrl-0 = <&duart_pins_a>; - status = "okay"; - }; - - usbphy0: usbphy@8007c000 { - status = "okay"; - }; - - usbphy1: usbphy@8007e000 { - status = "okay"; - }; - }; - }; - - ahb@80080000 { - usb0: usb@80080000 { - pinctrl-names = "default"; - pinctrl-0 = <&usb0_id_pins_a>; - vbus-supply = <®_usb0_vbus>; - dr_mode = "host"; - status = "okay"; - }; - }; - - sound { - compatible = "fsl,imx28-evk-sgtl5000", - "fsl,mxs-audio-sgtl5000"; - model = "imx28-evk-sgtl5000"; - saif-controllers = <&saif0 &saif1>; - audio-codec = <&sgtl5000>; - }; - - backlight_display: backlight@0 { - compatible = "pwm-backlight"; - pwms = <&pwm 0 50000>, <&pwm 1 50000>; - brightness-levels = <0 4 8 16 32 64 128 255>; - default-brightness-level = <4>; //Set 4 for identification on probing - }; - - slcd_backlight: backlight@1 { - compatible = "pwm-backlight"; - pwms = <&pwm 2 50000>; - brightness-levels = <0 63 127 255>; - default-brightness-level = <3>; - }; - - buzzer_cold: buzzer_cold { - compatible = "regulator-fixed"; - regulator-name = "fixed-supply"; - regulator-max-microvolt = <3300000>; - regulator-min-microvolt = <3300000>; - gpios = <&gpio3 26 GPIO_ACTIVE_LOW>; - regulator-always-on; - }; - - buzzer: buzzer { - compatible = "pwm-beeper"; - pwms = <&pwm 4 50000>; - amp-supply = <&buzzer_cold>; - }; -}; diff --git a/arch/arm/boot/dts/imx28-brain.dtsi b/arch/arm/boot/dts/imx28-brain.dtsi index 3a14912837ee..91beb02755c5 100644 --- a/arch/arm/boot/dts/imx28-brain.dtsi +++ b/arch/arm/boot/dts/imx28-brain.dtsi @@ -96,6 +96,23 @@ status = "okay"; }; + ssp2: spi@80014000 { + compatible = "fsl,imx28-spi"; + pinctrl-names = "default"; + pinctrl-0 = <&slcd_pins>; + clock-frequency = <16000000>; + status = "disabled"; + + slcd: slcd@0 { + reg = <0>; + status = "okay"; + compatible = "brain,st7586"; + spi-max-frequency = <16000000>; + reset-gpios = <&gpio2 18 GPIO_ACTIVE_HIGH>; + rotation = <180>; + }; + }; + pinctrl@80018000 { pinctrl-names = "default"; pinctrl-0 = <&hog_pins_3v3_pullup &hog_pins_3v3_nopull &hog_pins_1v8_nopull>; @@ -136,7 +153,7 @@ fsl,pull-up = ; }; - lcd_backlight: pwm@0 { + lcd_backlight_pins: pwm@0 { reg = <0>; fsl,pinmux-ids = < MX28_PAD_AUART1_RX__PWM_0 @@ -147,6 +164,27 @@ fsl,pull-up = ; }; + slcd_backlight_pin: pwm@1 { + reg = <1>; + fsl,pinmux-ids = < + MX28_PAD_PWM2__PWM_2 + >; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; + }; + + buzzer_pins: pwm@2 { + reg = <2>; + fsl,pinmux-ids = < + MX28_PAD_PWM4__PWM_4 + MX28_PAD_SAIF1_SDATA0__GPIO_3_26 + >; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; + }; + lcdif_pins: lcdif@0 { reg = <0>; fsl,pinmux-ids = < @@ -170,18 +208,50 @@ MX28_PAD_LCD_WR_RWN__LCD_WR_RWN MX28_PAD_LCD_RS__LCD_RS MX28_PAD_LCD_CS__LCD_CS - MX28_PAD_LCD_RESET__LCD_VSYNC >; fsl,drive-strength = ; fsl,voltage = ; fsl,pull-up = ; }; + + lcdif_vsync_pin: lcdif@1 { + reg = <1>; + fsl,pinmux-ids = < + MX28_PAD_LCD_RESET__LCD_VSYNC + >; + fsl,driver-strength = ; + fsl,voltage = ; + fsl,pull-up = ; + }; + + lcdif_reset_pin: lcdif@2 { + reg = <2>; + fsl,pinmux-ids = < + MX28_PAD_LCD_RESET__LCD_RESET + >; + fsl,driver-strength = ; + fsl,voltage = ; + fsl,pull-up = ; + }; + + slcd_pins: spi2@0 { + reg = <0>; + fsl,pinmux-ids = < + MX28_PAD_SSP2_SCK__SSP2_SCK + MX28_PAD_SSP2_MOSI__SSP2_CMD + MX28_PAD_SSP2_MISO__GPIO_2_18 + MX28_PAD_SSP2_SS0__SSP2_D3 + >; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; + }; }; brainlcd: lcdif@80030000 { compatible = "sharp,brainlcd"; pinctrl-names = "default"; - pinctrl-0 = <&lcdif_pins>; + pinctrl-0 = <&lcdif_pins &lcdif_vsync_pin>; status = "disabled"; }; }; @@ -225,6 +295,22 @@ VDDIO-supply = <®_3p3v>; clocks = <&saif0>; }; + + keyboard_i2c_2g: keyboard_i2c_2g@28 { + status = "disabled"; + compatible = "sharp,brain-kbd-i2c"; + reg = <0x28>; + interrupt-parent = <&gpio4>; + interrupts = <2 IRQ_TYPE_LEVEL_HIGH>; + }; + + lcd_touchscreen_i2c: sx8650@48 { + status = "disabled"; + compatible = "semtech,sx8650"; + reg = <0x48>; + interrupt-parent = <&gpio3>; + interrupts = <1 IRQ_TYPE_EDGE_FALLING>; + }; }; i2c1: i2c@8005a000 { @@ -243,7 +329,7 @@ pwm: pwm@80064000 { pinctrl-names = "default"; - pinctrl-0 = <&lcd_backlight>; + pinctrl-0 = <&lcd_backlight_pins>; status = "okay"; }; @@ -281,15 +367,40 @@ audio-codec = <&sgtl5000>; }; - backlight_display: backlight { + backlight_display: backlight@0 { compatible = "pwm-backlight"; pwms = <&pwm 0 50000>, <&pwm 1 50000>; brightness-levels = <0 4 8 16 32 64 128 255>; default-brightness-level = <4>; //Set 4 for identification on probing }; + slcd_backlight: backlight@1 { + status = "disabled"; + compatible = "pwm-backlight"; + pwms = <&pwm 2 50000>; + brightness-levels = <0 63 127 255>; + default-brightness-level = <3>; + }; + keyboard_gpio: keyboard_gpio { status = "disabled"; compatible = "sharp,brain-kbd-gpio"; }; + + buzzer_cold: buzzer_cold { + status = "disabled"; + compatible = "regulator-fixed"; + regulator-name = "fixed-supply"; + regulator-max-microvolt = <3300000>; + regulator-min-microvolt = <3300000>; + gpios = <&gpio3 26 GPIO_ACTIVE_LOW>; + regulator-always-on; + }; + + buzzer: buzzer { + status = "disabled"; + compatible = "pwm-beeper"; + pwms = <&pwm 4 50000>; + amp-supply = <&buzzer_cold>; + }; }; diff --git a/arch/arm/boot/dts/imx28-pwg5300.dts b/arch/arm/boot/dts/imx28-pwg5300.dts index f4a092ef94da..254b6465a8c9 100644 --- a/arch/arm/boot/dts/imx28-pwg5300.dts +++ b/arch/arm/boot/dts/imx28-pwg5300.dts @@ -4,15 +4,37 @@ /dts-v1/; #include -#include "imx28-brain-2g.dtsi" +#include "imx28-brain.dtsi" / { model = "SHARP Brain PW-G5300"; compatible = "sharp,pw-g5300", "sharp,brain", "fsl,imx28"; }; +&ssp2 { + status = "okay"; +}; + +&saif1 { + status = "disabled"; +}; + +&i2c1 { + status = "disabled"; +}; + +&pwm { + pinctrl-0 = <&lcd_backlight_pins &slcd_backlight_pin &buzzer_pins>; +}; + +&duart { + pinctrl-0 = <&duart_pins_a>; +}; + &brainlcd { status = "okay"; + compatible = "sharp,brainlcd-2g"; + pinctrl-0 = <&lcdif_pins &lcdif_reset_pin>; sharp,lcd-width = <480>; sharp,lcd-height = <320>; @@ -25,7 +47,11 @@ <&gpio4 16 GPIO_ACTIVE_HIGH>; }; -&keyboard_i2c { +&slcd { + status = "okay"; +}; + +&keyboard_i2c_2g { status = "okay"; symbol-keycode = <0x0c>; /* Page Down */ keymap = @@ -114,3 +140,19 @@ <0x06 KEY_LEFTCTRL>, /* Audio */ <0x0b KEY_LEFTALT>; /* Page Up */ }; + +&lcd_touchscreen_i2c { + status = "okay"; +}; + +&slcd_backlight { + status = "okay"; +}; + +&buzzer_cold { + status = "okay"; +}; + +&buzzer { + status = "okay"; +}; diff --git a/arch/arm/configs/brain_2g_defconfig b/arch/arm/configs/brain_2g_defconfig deleted file mode 100644 index 3f4d95c125c9..000000000000 --- a/arch/arm/configs/brain_2g_defconfig +++ /dev/null @@ -1,210 +0,0 @@ -CONFIG_SYSVIPC=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_CGROUPS=y -# CONFIG_UTS_NS is not set -# CONFIG_IPC_NS is not set -# CONFIG_PID_NS is not set -# CONFIG_NET_NS is not set -CONFIG_BLK_DEV_INITRD=y -CONFIG_PERF_EVENTS=y -# CONFIG_COMPAT_BRK is not set -# CONFIG_ARCH_MULTI_V7 is not set -CONFIG_ARCH_MXS=y -CONFIG_AEABI=y -CONFIG_MODULES=y -CONFIG_MODULE_FORCE_LOAD=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_TRIM_UNUSED_KSYMS=y -CONFIG_BLK_DEV_INTEGRITY=y -CONFIG_FRONTSWAP=y -CONFIG_ZSWAP=y -CONFIG_ZBUD=y -CONFIG_Z3FOLD=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_SYN_COOKIES=y -# CONFIG_INET_DIAG is not set -CONFIG_CFG80211=y -CONFIG_CFG80211_WEXT=y -CONFIG_MAC80211=y -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_DATAFLASH=y -CONFIG_MTD_SST25L=y -CONFIG_MTD_RAW_NAND=y -CONFIG_MTD_NAND_GPMI_NAND=y -CONFIG_MTD_SPI_NOR=y -CONFIG_MTD_UBI=y -# CONFIG_BLK_DEV is not set -CONFIG_EEPROM_AT24=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_NETDEVICES=y -CONFIG_ENC28J60=y -CONFIG_ICPLUS_PHY=y -CONFIG_MICREL_PHY=y -CONFIG_REALTEK_PHY=y -CONFIG_SMSC_PHY=y -CONFIG_USB_RTL8150=y -CONFIG_USB_RTL8152=y -CONFIG_USB_USBNET=y -CONFIG_USB_NET_SMSC95XX=y -CONFIG_USB_NET_RNDIS_HOST=y -# CONFIG_WLAN_VENDOR_ADMTEK is not set -CONFIG_ATH9K=y -CONFIG_ATH9K_HTC=y -CONFIG_ATH6KL=y -CONFIG_ATH6KL_USB=y -CONFIG_AR5523=y -CONFIG_ATH10K=y -CONFIG_ATH10K_USB=y -CONFIG_WCN36XX=y -# CONFIG_WLAN_VENDOR_ATMEL is not set -# CONFIG_WLAN_VENDOR_BROADCOM is not set -# CONFIG_WLAN_VENDOR_CISCO is not set -# CONFIG_WLAN_VENDOR_INTEL is not set -# CONFIG_WLAN_VENDOR_INTERSIL is not set -# CONFIG_WLAN_VENDOR_MARVELL is not set -CONFIG_MT7601U=y -CONFIG_MT76x0U=y -CONFIG_MT76x2U=y -CONFIG_RT2X00=y -CONFIG_RT2500USB=y -CONFIG_RT73USB=y -CONFIG_RT2800USB=y -CONFIG_RT2800USB_RT3573=y -CONFIG_RT2800USB_RT53XX=y -CONFIG_RT2800USB_RT55XX=y -CONFIG_RTL8187=y -CONFIG_RTL8XXXU=y -CONFIG_RTW88=y -# CONFIG_WLAN_VENDOR_RSI is not set -# CONFIG_WLAN_VENDOR_ST is not set -# CONFIG_WLAN_VENDOR_TI is not set -# CONFIG_WLAN_VENDOR_ZYDAS is not set -# CONFIG_WLAN_VENDOR_QUANTENNA is not set -CONFIG_INPUT_EVDEV=y -CONFIG_KEYBOARD_BRAIN_I2C=y -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_MXS_LRADC=y -CONFIG_TOUCHSCREEN_TSC2007=m -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_SERIAL_MXS_AUART=y -# CONFIG_HW_RANDOM is not set -# CONFIG_I2C_COMPAT is not set -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MXS=y -CONFIG_SPI=y -CONFIG_SPI_GPIO=m -CONFIG_SPI_MXS=y -CONFIG_GPIO_SYSFS=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_STMP3XXX_RTC_WATCHDOG=y -CONFIG_MFD_MXS_LRADC=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_DRM=y -CONFIG_DRM_UDL=y -CONFIG_DRM_PANEL_SEIKO_43WVF1G=y -CONFIG_TINYDRM_BRAIN_2G=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_BACKLIGHT_PWM=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -# CONFIG_LOGO_LINUX_CLUT224 is not set -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_SOC=y -CONFIG_SND_MXS_SOC=y -CONFIG_SND_SOC_MXS_SGTL5000=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_CHIPIDEA=y -CONFIG_USB_CHIPIDEA_UDC=y -CONFIG_USB_CHIPIDEA_HOST=y -CONFIG_USB_MXS_PHY=y -CONFIG_USB_GADGET=y -CONFIG_USB_CONFIGFS=y -CONFIG_USB_CONFIGFS_RNDIS=y -CONFIG_MMC=y -CONFIG_MMC_MXS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_ONESHOT=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_BACKLIGHT=y -CONFIG_LEDS_TRIGGER_GPIO=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_DS1307=m -CONFIG_RTC_DRV_STMP=y -CONFIG_DMADEVICES=y -CONFIG_MXS_DMA=y -CONFIG_STAGING=y -CONFIG_WILC1000_SDIO=y -CONFIG_EXFAT_FS=y -CONFIG_IIO=y -CONFIG_MXS_LRADC_ADC=y -CONFIG_IIO_SYSFS_TRIGGER=y -CONFIG_PWM=y -CONFIG_PWM_MXS=y -CONFIG_NVMEM_MXS_OCOTP=y -CONFIG_EXT4_FS=y -# CONFIG_DNOTIFY is not set -CONFIG_FSCACHE=m -CONFIG_FSCACHE_STATS=y -CONFIG_CACHEFILES=m -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_LZO=y -CONFIG_JFFS2_RUBIN=y -CONFIG_UBIFS_FS=y -CONFIG_UBIFS_FS_ADVANCED_COMPR=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_15=y -CONFIG_CRYPTO_DEV_MXS_DCP=y -CONFIG_CRC7=m -CONFIG_FONTS=y -CONFIG_FONT_8x16=y -CONFIG_FONT_6x11=y -CONFIG_PRINTK_TIME=y -CONFIG_FRAME_WARN=2048 -CONFIG_DEBUG_FS=y -CONFIG_STACKTRACE=y -# CONFIG_RUNTIME_TESTING_MENU is not set -CONFIG_STRICT_DEVMEM=y -CONFIG_DEBUG_USER=y -CONFIG_TOUCHSCREEN_SX8654=y -CONFIG_INPUT_PWM_BEEPER=y -CONFIG_TINYDRM_BRAIN_ST7586=y diff --git a/arch/arm/configs/brain_defconfig b/arch/arm/configs/brain_defconfig index 46132a7f48ff..80295f5fd8fc 100644 --- a/arch/arm/configs/brain_defconfig +++ b/arch/arm/configs/brain_defconfig @@ -207,3 +207,8 @@ CONFIG_STACKTRACE=y # CONFIG_RUNTIME_TESTING_MENU is not set CONFIG_STRICT_DEVMEM=y CONFIG_DEBUG_USER=y +CONFIG_TOUCHSCREEN_SX8654=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_PWM_BEEPER=y +CONFIG_TINYDRM_BRAIN_ST7586=y +CONFIG_TINYDRM_BRAIN_2G=y diff --git a/drivers/gpu/drm/tiny/brain-lq050j1ug01.c b/drivers/gpu/drm/tiny/brain-lq050j1ug01.c index 143e25107508..f63b35426941 100644 --- a/drivers/gpu/drm/tiny/brain-lq050j1ug01.c +++ b/drivers/gpu/drm/tiny/brain-lq050j1ug01.c @@ -554,7 +554,7 @@ static struct drm_driver brain_driver = { .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &brain_fops, DRM_GEM_CMA_VMAP_DRIVER_OPS, - .name = "brain", + .name = "brain-2g", .desc = "Sharp LQ050J1UG01", .date = "20210417", .major = 1, @@ -562,7 +562,7 @@ static struct drm_driver brain_driver = { }; static const struct of_device_id brain_of_match[] = { - { .compatible = "sharp,brainlcd" }, + { .compatible = "sharp,brainlcd-2g" }, {}, }; MODULE_DEVICE_TABLE(of, brain_of_match); @@ -686,7 +686,7 @@ static struct platform_driver brain_platform_driver = { .remove = brain_remove, .shutdown = brain_shutdown, .driver = { - .name = "brain", + .name = "brain-2g", .of_match_table = brain_of_match, }, };