Commit 187401d3 authored by jan.koester's avatar jan.koester
Browse files

cleaups

parent 52474772

arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts

+28 −0
Original line number Diff line number Diff line
@@ -149,6 +149,18 @@ vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator { 
		vin-supply = <&vcc5v0_sys>;

	};



	vcc3v3_pcie2x1l0: vcc3v3-pcie2x1l0-regulator {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&pcie_m2_1_pwren>;

		regulator-name = "vcc3v3_pcie2x1l0";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vcc5v0_sys>;

	};



	vcc3v3_pcie30: vcc3v3-pcie30-regulator {

		compatible = "regulator-fixed";

		enable-active-high;
@@ -441,6 +453,14 @@ &pcie2x1l1 { 
	status = "okay";

};



&pcie2x1l1 {

	reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;

	vpcie3v3-supply = <&vcc3v3_pcie2x1l0>;

	pinctrl-names = "default";

	pinctrl-0 = <&pcie2_1_rst>;

	status = "okay";

};



&pcie2x1l2 {

	reset-gpios = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>;

	vpcie3v3-supply = <&vcc_3v3_pcie20>;
@@ -491,6 +511,10 @@ pcie2_1_rst: pcie2-1-rst { 
			rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;

		};



		pcie2_1_rst: pcie2-1-rst {

			rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;

		};



		pcie2_2_rst: pcie2-2-rst {

			rockchip,pins = <4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;

		};
@@ -502,6 +526,10 @@ pcie_m2_0_pwren: pcie-m20-pwren { 
		pcie_m2_1_pwren: pcie-m21-pwren {

			rockchip,pins = <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;

		};



		pcie_m2_1_pwren: pcie-m21-pwren {

			rockchip,pins = <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	usb {

block/partitions/core.c

+5 −0
Original line number Diff line number Diff line
@@ -463,6 +463,11 @@ int bdev_add_partition(struct gendisk *disk, int partno, sector_t start, 
		goto out;

	}



	if (disk->flags & GENHD_FL_NO_PART) {

		ret = -EINVAL;

		goto out;

	}



	if (partition_overlaps(disk, start, length, -1)) {

		ret = -EBUSY;

		goto out;

drivers/acpi/ec.c

+10 −0
Original line number Diff line number Diff line
@@ -1923,6 +1923,16 @@ static const struct dmi_system_id ec_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "HP 250 G7 Notebook PC"),

		},

	},

	{

		/*

		 * HP 250 G7 Notebook PC

		 */

		.callback = ec_honor_dsdt_gpe,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "HP"),

			DMI_MATCH(DMI_PRODUCT_NAME, "HP 250 G7 Notebook PC"),

		},

	},

	{

		/*

		 * Samsung hardware

drivers/acpi/resource.c

+26 −0
Original line number Diff line number Diff line
@@ -446,6 +446,13 @@ static const struct dmi_system_id asus_laptop[] = { 
			DMI_MATCH(DMI_BOARD_NAME, "B1402CVA"),

		},

	},

	{

		/* Asus ExpertBook B1402CVA */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_BOARD_NAME, "B1402CVA"),

		},

	},

	{

		.ident = "Asus ExpertBook B1502CBA",

		.matches = {
@@ -514,6 +521,25 @@ static const struct dmi_system_id maingear_laptop[] = { 
			DMI_MATCH(DMI_BOARD_NAME, "GM6XGxX"),

		},

	},

	{

		/* TongFang GMxXGxx/TUXEDO Polaris 15 Gen5 AMD */

		.matches = {

			DMI_MATCH(DMI_BOARD_NAME, "GMxXGxx"),

		},

	},

	{

		/* TongFang GMxXGxx sold as Eluktronics Inc. RP-15 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Eluktronics Inc."),

			DMI_MATCH(DMI_BOARD_NAME, "RP-15"),

		},

	},

	{

		/* TongFang GM6XGxX/TUXEDO Stellaris 16 Gen5 AMD */

		.matches = {

			DMI_MATCH(DMI_BOARD_NAME, "GM6XGxX"),

		},

	},

	{

		.ident = "MAINGEAR Vector Pro 2 17",

		.matches = {

drivers/acpi/video_detect.c

+26 −0
Original line number Diff line number Diff line
@@ -140,6 +140,16 @@ static int video_detect_portege_r100(const struct dmi_system_id *d) 
	return 0;

}



static int video_detect_portege_r100(const struct dmi_system_id *d)

{

	struct pci_dev *dev;

	/* Search for Trident CyberBlade XP4m32 to confirm Portégé R100 */

	dev = pci_get_device(PCI_VENDOR_ID_TRIDENT, 0x2100, NULL);

	if (dev)

		acpi_backlight_dmi = acpi_backlight_vendor;

	return 0;

}



static const struct dmi_system_id video_detect_dmi_table[] = {

	/*

	 * Models which should use the vendor backlight interface,
@@ -296,6 +306,22 @@ static const struct dmi_system_id video_detect_dmi_table[] = { 
		},

	},



	/*

	 * Toshiba Portégé R100 has working both acpi_video and toshiba_acpi

	 * vendor driver. But none of them gets activated as it has a VGA with

	 * no kernel driver (Trident CyberBlade XP4m32).

	 * The DMI strings are generic so check for the VGA chip in callback.

	 */

	{

	 .callback = video_detect_portege_r100,

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),

		DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "Version 1.0"),

		DMI_MATCH(DMI_BOARD_NAME, "Portable PC")

		},

	},



	/*

	 * Models which need acpi_video backlight control where the GPU drivers

	 * do not call acpi_video_register_backlight() because no internal panel