diff --git a/Documentation/drivers/soundwire.md b/Documentation/drivers/soundwire.md index 9c48b75b37..dcefa046e2 100644 --- a/Documentation/drivers/soundwire.md +++ b/Documentation/drivers/soundwire.md @@ -375,7 +375,7 @@ chip and can be decoded for this table with the codec datasheet and board schema * @version: SoundWire specification version from &enum soundwire_version. * @link_id: Zero-based SoundWire Link Number. * @unique_id: Unique ID for multiple devices. - * @manufacturer_id: Manufacturer ID from include/device/mipi_ids.h. + * @manufacturer_id: Manufacturer ID from include/mipi/ids.h. * @part_id: Vendor defined part ID. * @class: MIPI class encoding in &enum mipi_class. */ diff --git a/src/device/Kconfig b/src/device/Kconfig index 16daeaa25d..5ae3466d32 100644 --- a/src/device/Kconfig +++ b/src/device/Kconfig @@ -1,7 +1,5 @@ ## SPDX-License-Identifier: GPL-2.0-only -source "src/device/mipi/Kconfig" - menu "Devices" config HAVE_VGA_TEXT_FRAMEBUFFER diff --git a/src/device/Makefile.inc b/src/device/Makefile.inc index 70013c9f06..808648d4b4 100644 --- a/src/device/Makefile.inc +++ b/src/device/Makefile.inc @@ -40,7 +40,7 @@ ramstage-$(CONFIG_PCIEXP_PLUGIN_SUPPORT) += pciexp_device.c ramstage-$(CONFIG_CARDBUS_PLUGIN_SUPPORT) += cardbus_device.c endif -subdirs-y += oprom dram mipi +subdirs-y += oprom dram bootblock-$(CONFIG_SOFTWARE_I2C) += software_i2c.c verstage-$(CONFIG_SOFTWARE_I2C) += software_i2c.c diff --git a/src/device/mipi/Kconfig b/src/drivers/mipi/Kconfig similarity index 100% rename from src/device/mipi/Kconfig rename to src/drivers/mipi/Kconfig diff --git a/src/device/mipi/Makefile.inc b/src/drivers/mipi/Makefile.inc similarity index 100% rename from src/device/mipi/Makefile.inc rename to src/drivers/mipi/Makefile.inc diff --git a/src/device/mipi/panel-AUO_B101UAN08_3.c b/src/drivers/mipi/panel-AUO_B101UAN08_3.c similarity index 98% rename from src/device/mipi/panel-AUO_B101UAN08_3.c rename to src/drivers/mipi/panel-AUO_B101UAN08_3.c index 5bdb7ba3cb..8eeac85dd6 100644 --- a/src/device/mipi/panel-AUO_B101UAN08_3.c +++ b/src/drivers/mipi/panel-AUO_B101UAN08_3.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include +#include struct panel_serializable_data AUO_B101UAN08_3 = { .edid = { diff --git a/src/device/mipi/panel-AUO_KD101N80_45NA.c b/src/drivers/mipi/panel-AUO_KD101N80_45NA.c similarity index 95% rename from src/device/mipi/panel-AUO_KD101N80_45NA.c rename to src/drivers/mipi/panel-AUO_KD101N80_45NA.c index 5856b0d8a0..436940c9e4 100644 --- a/src/device/mipi/panel-AUO_KD101N80_45NA.c +++ b/src/drivers/mipi/panel-AUO_KD101N80_45NA.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include +#include struct panel_serializable_data AUO_KD101N80_45NA = { .edid = { diff --git a/src/device/mipi/panel-AUO_NT51021D8P.c b/src/drivers/mipi/panel-AUO_NT51021D8P.c similarity index 95% rename from src/device/mipi/panel-AUO_NT51021D8P.c rename to src/drivers/mipi/panel-AUO_NT51021D8P.c index 37c41fdb3d..d448c419db 100644 --- a/src/device/mipi/panel-AUO_NT51021D8P.c +++ b/src/drivers/mipi/panel-AUO_NT51021D8P.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include +#include struct panel_serializable_data AUO_NT51021D8P = { .edid = { diff --git a/src/device/mipi/panel-BOE_TV080WUM_NG0.c b/src/drivers/mipi/panel-BOE_TV080WUM_NG0.c similarity index 99% rename from src/device/mipi/panel-BOE_TV080WUM_NG0.c rename to src/drivers/mipi/panel-BOE_TV080WUM_NG0.c index baeb655644..c100f42154 100644 --- a/src/device/mipi/panel-BOE_TV080WUM_NG0.c +++ b/src/drivers/mipi/panel-BOE_TV080WUM_NG0.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include +#include struct panel_serializable_data BOE_TV080WUM_NG0 = { .edid = { diff --git a/src/device/mipi/panel-BOE_TV101WUM_N53.c b/src/drivers/mipi/panel-BOE_TV101WUM_N53.c similarity index 99% rename from src/device/mipi/panel-BOE_TV101WUM_N53.c rename to src/drivers/mipi/panel-BOE_TV101WUM_N53.c index b40999f685..bc454747b4 100644 --- a/src/device/mipi/panel-BOE_TV101WUM_N53.c +++ b/src/drivers/mipi/panel-BOE_TV101WUM_N53.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include +#include struct panel_serializable_data BOE_TV101WUM_N53 = { .edid = { diff --git a/src/device/mipi/panel-BOE_TV101WUM_NG0.c b/src/drivers/mipi/panel-BOE_TV101WUM_NG0.c similarity index 99% rename from src/device/mipi/panel-BOE_TV101WUM_NG0.c rename to src/drivers/mipi/panel-BOE_TV101WUM_NG0.c index fc3f998192..989fb62050 100644 --- a/src/device/mipi/panel-BOE_TV101WUM_NG0.c +++ b/src/drivers/mipi/panel-BOE_TV101WUM_NG0.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include +#include struct panel_serializable_data BOE_TV101WUM_NG0 = { .edid = { diff --git a/src/device/mipi/panel-BOE_TV101WUM_NL6.c b/src/drivers/mipi/panel-BOE_TV101WUM_NL6.c similarity index 99% rename from src/device/mipi/panel-BOE_TV101WUM_NL6.c rename to src/drivers/mipi/panel-BOE_TV101WUM_NL6.c index 7369cbeb9a..2c990f8729 100644 --- a/src/device/mipi/panel-BOE_TV101WUM_NL6.c +++ b/src/drivers/mipi/panel-BOE_TV101WUM_NL6.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include +#include struct panel_serializable_data BOE_TV101WUM_NL6 = { .edid = { diff --git a/src/device/mipi/panel-BOE_TV105WUM_NW0.c b/src/drivers/mipi/panel-BOE_TV105WUM_NW0.c similarity index 99% rename from src/device/mipi/panel-BOE_TV105WUM_NW0.c rename to src/drivers/mipi/panel-BOE_TV105WUM_NW0.c index efe6b66c71..69311938b5 100644 --- a/src/device/mipi/panel-BOE_TV105WUM_NW0.c +++ b/src/drivers/mipi/panel-BOE_TV105WUM_NW0.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include +#include struct panel_serializable_data BOE_TV105WUM_NW0 = { .edid = { diff --git a/src/device/mipi/panel-CMN_P097PFG_SSD2858.c b/src/drivers/mipi/panel-CMN_P097PFG_SSD2858.c similarity index 98% rename from src/device/mipi/panel-CMN_P097PFG_SSD2858.c rename to src/drivers/mipi/panel-CMN_P097PFG_SSD2858.c index 89154b8221..73e85962dd 100644 --- a/src/device/mipi/panel-CMN_P097PFG_SSD2858.c +++ b/src/drivers/mipi/panel-CMN_P097PFG_SSD2858.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include +#include struct panel_serializable_data P097PFG_SSD2858 = { .edid = { diff --git a/src/device/mipi/panel-INX_OTA7290D10P.c b/src/drivers/mipi/panel-INX_OTA7290D10P.c similarity index 99% rename from src/device/mipi/panel-INX_OTA7290D10P.c rename to src/drivers/mipi/panel-INX_OTA7290D10P.c index 0253ba7235..79f72f0fc7 100644 --- a/src/device/mipi/panel-INX_OTA7290D10P.c +++ b/src/drivers/mipi/panel-INX_OTA7290D10P.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include +#include struct panel_serializable_data INX_OTA7290D10P = { .edid = { diff --git a/src/device/mipi/panel-STA_2081101QFH032011_53G.c b/src/drivers/mipi/panel-STA_2081101QFH032011_53G.c similarity index 98% rename from src/device/mipi/panel-STA_2081101QFH032011_53G.c rename to src/drivers/mipi/panel-STA_2081101QFH032011_53G.c index 87e53cee59..be8ba7360f 100644 --- a/src/device/mipi/panel-STA_2081101QFH032011_53G.c +++ b/src/drivers/mipi/panel-STA_2081101QFH032011_53G.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include +#include struct panel_serializable_data STA_QFH032011_53G = { .edid = { diff --git a/src/device/mipi/panel-VIS_RM69299.c b/src/drivers/mipi/panel-VIS_RM69299.c similarity index 96% rename from src/device/mipi/panel-VIS_RM69299.c rename to src/drivers/mipi/panel-VIS_RM69299.c index 5fdea6039d..aff2a99c38 100644 --- a/src/device/mipi/panel-VIS_RM69299.c +++ b/src/drivers/mipi/panel-VIS_RM69299.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include +#include struct panel_serializable_data VIS_RM69299 = { .edid = { diff --git a/src/device/mipi/panel.c b/src/drivers/mipi/panel.c similarity index 97% rename from src/device/mipi/panel.c rename to src/drivers/mipi/panel.c index f2bf3408c2..e8469a6e36 100644 --- a/src/device/mipi/panel.c +++ b/src/drivers/mipi/panel.c @@ -2,7 +2,7 @@ #include #include -#include +#include cb_err_t mipi_panel_parse_init_commands(const void *buf, mipi_cmd_func_t cmd_func) { diff --git a/src/drivers/soundwire/alc1308/alc1308.c b/src/drivers/soundwire/alc1308/alc1308.c index df60d47bf7..f16d3a2de5 100644 --- a/src/drivers/soundwire/alc1308/alc1308.c +++ b/src/drivers/soundwire/alc1308/alc1308.c @@ -5,8 +5,8 @@ #include #include #include -#include #include +#include #include #include "chip.h" diff --git a/src/drivers/soundwire/alc5682/alc5682.c b/src/drivers/soundwire/alc5682/alc5682.c index e15ecd421a..c1aaff6cb7 100644 --- a/src/drivers/soundwire/alc5682/alc5682.c +++ b/src/drivers/soundwire/alc5682/alc5682.c @@ -4,9 +4,9 @@ #include #include #include -#include #include #include +#include #include #include "chip.h" diff --git a/src/drivers/soundwire/alc711/alc711.c b/src/drivers/soundwire/alc711/alc711.c index 44a9e98deb..34d55c78e4 100644 --- a/src/drivers/soundwire/alc711/alc711.c +++ b/src/drivers/soundwire/alc711/alc711.c @@ -5,8 +5,8 @@ #include #include #include -#include #include +#include #include #include "chip.h" diff --git a/src/drivers/soundwire/max98373/max98373.c b/src/drivers/soundwire/max98373/max98373.c index 28796c06bc..fb202fe811 100644 --- a/src/drivers/soundwire/max98373/max98373.c +++ b/src/drivers/soundwire/max98373/max98373.c @@ -5,8 +5,8 @@ #include #include #include -#include #include +#include #include #include "chip.h" diff --git a/src/include/device/soundwire.h b/src/include/device/soundwire.h index 6f966ae2f4..a78b52b719 100644 --- a/src/include/device/soundwire.h +++ b/src/include/device/soundwire.h @@ -76,7 +76,7 @@ enum mipi_class { * @version: SoundWire specification version from &enum soundwire_version. * @link_id: Zero-based SoundWire master link id. * @unique_id: Unique ID for multiple slave devices on the same bus. - * @manufacturer_id: Manufacturer ID from include/device/mipi_ids.h. + * @manufacturer_id: Manufacturer ID from include/mipi/ids.h. * @part_id: Vendor defined part ID. * @class: MIPI class encoding in &enum mipi_class. */ diff --git a/src/include/device/mipi_ids.h b/src/include/mipi/ids.h similarity index 88% rename from src/include/device/mipi_ids.h rename to src/include/mipi/ids.h index 50faba7806..982e6e14b4 100644 --- a/src/include/device/mipi_ids.h +++ b/src/include/mipi/ids.h @@ -4,8 +4,8 @@ * MIPI Alliance Manufacturer IDs from https://mid.mipi.org */ -#ifndef __DEVICE_MIPI_IDS_H__ -#define __DEVICE_MIPI_IDS_H__ +#ifndef __MIPI_IDS_H__ +#define __MIPI_IDS_H__ /* Board Members */ #define MIPI_MFG_ID_INTEL 0x0105 @@ -26,4 +26,4 @@ #define MIPI_MFG_ID_MAXIM 0x019f #define MIPI_DEV_ID_MAXIM_MAX98373 0x8373 -#endif /* __DEVICE_MIPI_IDS_H__ */ +#endif /* __MIPI_IDS_H__ */ diff --git a/src/include/device/mipi_panel.h b/src/include/mipi/panel.h similarity index 92% rename from src/include/device/mipi_panel.h rename to src/include/mipi/panel.h index 95fcb69633..e0a1463823 100644 --- a/src/include/device/mipi_panel.h +++ b/src/include/mipi/panel.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#ifndef __DEVICE_MIPI_PANEL_H__ -#define __DEVICE_MIPI_PANEL_H__ +#ifndef __MIPI_PANEL_H__ +#define __MIPI_PANEL_H__ #include #include @@ -53,4 +53,4 @@ cb_err_t mipi_panel_parse_init_commands(const void *buf, mipi_cmd_func_t cmd_fun #define PANEL_END \ PANEL_CMD_END -#endif /* __DEVICE_MIPI_PANEL_H__ */ +#endif /* __MIPI_PANEL_H__ */ diff --git a/src/mainboard/google/kukui/panel.h b/src/mainboard/google/kukui/panel.h index e434d9f5db..17c19837bb 100644 --- a/src/mainboard/google/kukui/panel.h +++ b/src/mainboard/google/kukui/panel.h @@ -3,7 +3,7 @@ #ifndef __MAINBOARD_GOOGLE_KUKUI_PANEL_H__ #define __MAINBOARD_GOOGLE_KUKUI_PANEL_H__ -#include +#include #include struct panel_description { diff --git a/src/mainboard/google/trogdor/mainboard.c b/src/mainboard/google/trogdor/mainboard.c index 02a1f7d27b..4b395ba07c 100644 --- a/src/mainboard/google/trogdor/mainboard.c +++ b/src/mainboard/google/trogdor/mainboard.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/soc/mediatek/common/dsi.c b/src/soc/mediatek/common/dsi.c index c517726175..fbf3cca2ec 100644 --- a/src/soc/mediatek/common/dsi.c +++ b/src/soc/mediatek/common/dsi.c @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/soc/qualcomm/sc7180/display/dsi.c b/src/soc/qualcomm/sc7180/display/dsi.c index e0aa0efd4d..e9bd702159 100644 --- a/src/soc/qualcomm/sc7180/display/dsi.c +++ b/src/soc/qualcomm/sc7180/display/dsi.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include +#include #include #include #include