2019-09-19 14:43:19 +00:00
|
|
|
From 5b904ae953179183256cee266fed3aa2ae638b75 Mon Sep 17 00:00:00 2001
|
2019-07-09 18:32:28 +00:00
|
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
|
|
Date: Wed, 27 Feb 2019 20:08:48 +0000
|
2019-09-19 14:43:19 +00:00
|
|
|
Subject: [PATCH 363/806] config: Add CONFIG_FB_TFT_SH1106=m
|
2019-07-09 18:32:28 +00:00
|
|
|
|
|
|
|
See: https://github.com/raspberrypi/linux/issues/2876
|
|
|
|
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
|
|
---
|
|
|
|
arch/arm/configs/bcm2709_defconfig | 3 ++-
|
|
|
|
arch/arm/configs/bcmrpi_defconfig | 3 ++-
|
|
|
|
arch/arm64/configs/bcmrpi3_defconfig | 1 +
|
|
|
|
3 files changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
--- a/arch/arm/configs/bcm2709_defconfig
|
|
|
|
+++ b/arch/arm/configs/bcm2709_defconfig
|
|
|
|
@@ -905,8 +905,8 @@ CONFIG_SND_BCM2835_SOC_I2S=m
|
|
|
|
CONFIG_SND_BCM2708_SOC_3DLAB_NANO_PLAYER=m
|
|
|
|
CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m
|
|
|
|
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
|
|
|
|
-CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m
|
|
|
|
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m
|
|
|
|
+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m
|
|
|
|
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
|
|
|
|
CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
|
|
|
|
CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m
|
|
|
|
@@ -1203,6 +1203,7 @@ CONFIG_FB_TFT_PCD8544=m
|
|
|
|
CONFIG_FB_TFT_RA8875=m
|
|
|
|
CONFIG_FB_TFT_S6D02A1=m
|
|
|
|
CONFIG_FB_TFT_S6D1121=m
|
|
|
|
+CONFIG_FB_TFT_SH1106=m
|
|
|
|
CONFIG_FB_TFT_SSD1289=m
|
|
|
|
CONFIG_FB_TFT_SSD1306=m
|
|
|
|
CONFIG_FB_TFT_SSD1331=m
|
|
|
|
--- a/arch/arm/configs/bcmrpi_defconfig
|
|
|
|
+++ b/arch/arm/configs/bcmrpi_defconfig
|
|
|
|
@@ -898,8 +898,8 @@ CONFIG_SND_BCM2835_SOC_I2S=m
|
|
|
|
CONFIG_SND_BCM2708_SOC_3DLAB_NANO_PLAYER=m
|
|
|
|
CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m
|
|
|
|
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
|
|
|
|
-CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m
|
|
|
|
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m
|
|
|
|
+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m
|
|
|
|
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
|
|
|
|
CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
|
|
|
|
CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m
|
|
|
|
@@ -1196,6 +1196,7 @@ CONFIG_FB_TFT_PCD8544=m
|
|
|
|
CONFIG_FB_TFT_RA8875=m
|
|
|
|
CONFIG_FB_TFT_S6D02A1=m
|
|
|
|
CONFIG_FB_TFT_S6D1121=m
|
|
|
|
+CONFIG_FB_TFT_SH1106=m
|
|
|
|
CONFIG_FB_TFT_SSD1289=m
|
|
|
|
CONFIG_FB_TFT_SSD1306=m
|
|
|
|
CONFIG_FB_TFT_SSD1331=m
|
|
|
|
--- a/arch/arm64/configs/bcmrpi3_defconfig
|
|
|
|
+++ b/arch/arm64/configs/bcmrpi3_defconfig
|
|
|
|
@@ -1061,6 +1061,7 @@ CONFIG_FB_TFT_PCD8544=m
|
|
|
|
CONFIG_FB_TFT_RA8875=m
|
|
|
|
CONFIG_FB_TFT_S6D02A1=m
|
|
|
|
CONFIG_FB_TFT_S6D1121=m
|
|
|
|
+CONFIG_FB_TFT_SH1106=m
|
|
|
|
CONFIG_FB_TFT_SSD1289=m
|
|
|
|
CONFIG_FB_TFT_SSD1306=m
|
|
|
|
CONFIG_FB_TFT_SSD1331=m
|