Improved patches for -p1
This commit is contained in:
parent
b93742a8c5
commit
f99e593c55
@ -1,7 +1,7 @@
|
|||||||
diff --git arch/arm64/boot/dts/freescale/Makefile arch/arm64/boot/dts/freescale/Makefile
|
diff --git arch/arm64/boot/dts/freescale/Makefile arch/arm64/boot/dts/freescale/Makefile
|
||||||
index da7ede2f5744..2a0a0f56b9a8 100644
|
index da7ede2f5744..2a0a0f56b9a8 100644
|
||||||
--- arch/arm64/boot/dts/freescale/Makefile
|
--- linux-imx/arch/arm64/boot/dts/freescale/Makefile
|
||||||
+++ arch/arm64/boot/dts/freescale/Makefile
|
+++ linux-imx/arch/arm64/boot/dts/freescale/Makefile
|
||||||
@@ -118,7 +118,8 @@
|
@@ -118,7 +118,8 @@
|
||||||
fsl-imx8mq-evk-inmate.dtb \
|
fsl-imx8mq-evk-inmate.dtb \
|
||||||
fsl-imx8mq-evk-dp.dtb \
|
fsl-imx8mq-evk-dp.dtb \
|
||||||
@ -16,7 +16,7 @@ diff --git arch/arm64/boot/dts/freescale/fsl-imx8mm-tgr.dts arch/arm64/boot/dts/
|
|||||||
new file mode 100755
|
new file mode 100755
|
||||||
index 000000000000..411de1c8c620
|
index 000000000000..411de1c8c620
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ arch/arm64/boot/dts/freescale/fsl-imx8mm-tgr.dts
|
+++ linux-imx/arch/arm64/boot/dts/freescale/fsl-imx8mm-tgr.dts
|
||||||
@@ -0,0 +1,629 @@
|
@@ -0,0 +1,629 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright 2018 NXP
|
+ * Copyright 2018 NXP
|
||||||
@ -649,8 +649,8 @@ index 000000000000..411de1c8c620
|
|||||||
+};
|
+};
|
||||||
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mm.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8mm.dtsi
|
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mm.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8mm.dtsi
|
||||||
index e200219ea8bb..333c9fbaf07f 100644
|
index e200219ea8bb..333c9fbaf07f 100644
|
||||||
--- arch/arm64/boot/dts/freescale/fsl-imx8mm.dtsi
|
--- linux-imx/arch/arm64/boot/dts/freescale/fsl-imx8mm.dtsi
|
||||||
+++ arch/arm64/boot/dts/freescale/fsl-imx8mm.dtsi
|
+++ linux-imx/arch/arm64/boot/dts/freescale/fsl-imx8mm.dtsi
|
||||||
@@ -65,7 +65,7 @@
|
@@ -65,7 +65,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
diff --git drivers/usb/misc/usb251xb.c drivers/usb/misc/usb251xb.c
|
diff --git drivers/usb/misc/usb251xb.c drivers/usb/misc/usb251xb.c
|
||||||
index 135c91c434bf..a1ca97c07266 100644
|
index 135c91c434bf..a1ca97c07266 100644
|
||||||
--- drivers/usb/misc/usb251xb.c
|
--- linux-imx/drivers/usb/misc/usb251xb.c
|
||||||
+++ drivers/usb/misc/usb251xb.c
|
+++ linux-imx/drivers/usb/misc/usb251xb.c
|
||||||
@@ -155,6 +155,11 @@ struct usb251xb_data {
|
@@ -155,6 +155,11 @@ struct usb251xb_data {
|
||||||
char product_str[USB251XB_STRING_BUFSIZE / 2]; /* ASCII string */
|
char product_str[USB251XB_STRING_BUFSIZE / 2]; /* ASCII string */
|
||||||
};
|
};
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
diff --git drivers/mfd/Kconfig drivers/mfd/Kconfig
|
diff --git drivers/mfd/Kconfig drivers/mfd/Kconfig
|
||||||
index 997a6172735e..e33bd218301b 100644
|
index 997a6172735e..e33bd218301b 100644
|
||||||
--- drivers/mfd/Kconfig
|
--- linux-imx/drivers/mfd/Kconfig
|
||||||
+++ drivers/mfd/Kconfig
|
+++ linux-imx/drivers/mfd/Kconfig
|
||||||
@@ -1818,6 +1818,14 @@ config MFD_BD71837
|
@@ -1818,6 +1818,14 @@ config MFD_BD71837
|
||||||
if you say yes here you get support for the BD71837
|
if you say yes here you get support for the BD71837
|
||||||
Power Management chips.
|
Power Management chips.
|
||||||
@ -30,7 +30,7 @@ diff --git drivers/mfd/pca9450.c drivers/mfd/pca9450.c
|
|||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000000..85ce6e3eef68
|
index 000000000000..85ce6e3eef68
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ drivers/mfd/pca9450.c
|
+++ linux-imx/drivers/mfd/pca9450.c
|
||||||
@@ -0,0 +1,304 @@
|
@@ -0,0 +1,304 @@
|
||||||
+/*
|
+/*
|
||||||
+ * @file pca9450.c -- NXP PCA9450 mfd driver
|
+ * @file pca9450.c -- NXP PCA9450 mfd driver
|
||||||
@ -354,8 +354,8 @@ index 5361947ea726..e5b3c9ffb982 100644
|
|||||||
|
|
||||||
diff --git drivers/regulator/Makefile drivers/regulator/Makefile
|
diff --git drivers/regulator/Makefile drivers/regulator/Makefile
|
||||||
index 1bddbefbc8e7..0072ad5666f8 100644
|
index 1bddbefbc8e7..0072ad5666f8 100644
|
||||||
--- drivers/regulator/Makefile
|
--- linux-imx/drivers/regulator/Makefile
|
||||||
+++ drivers/regulator/Makefile
|
+++ linux-imx/drivers/regulator/Makefile
|
||||||
@@ -126,6 +126,7 @@ obj-$(CONFIG_REGULATOR_WM8350) += wm8350-regulator.o
|
@@ -126,6 +126,7 @@ obj-$(CONFIG_REGULATOR_WM8350) += wm8350-regulator.o
|
||||||
obj-$(CONFIG_REGULATOR_WM8400) += wm8400-regulator.o
|
obj-$(CONFIG_REGULATOR_WM8400) += wm8400-regulator.o
|
||||||
obj-$(CONFIG_REGULATOR_WM8994) += wm8994-regulator.o
|
obj-$(CONFIG_REGULATOR_WM8994) += wm8994-regulator.o
|
||||||
@ -368,7 +368,7 @@ diff --git drivers/regulator/pca9450-regulator.c drivers/regulator/pca9450-regul
|
|||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000000..6b9ce8f34e0e
|
index 000000000000..6b9ce8f34e0e
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ drivers/regulator/pca9450-regulator.c
|
+++ linux-imx/drivers/regulator/pca9450-regulator.c
|
||||||
@@ -0,0 +1,783 @@
|
@@ -0,0 +1,783 @@
|
||||||
+/*
|
+/*
|
||||||
+ * @file pca9450-regulator.c ROHM PCA9450MWV regulator driver
|
+ * @file pca9450-regulator.c ROHM PCA9450MWV regulator driver
|
||||||
@ -1157,7 +1157,7 @@ diff --git include/linux/mfd/pca9450.h include/linux/mfd/pca9450.h
|
|||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000000..b689c2dd3b94
|
index 000000000000..b689c2dd3b94
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ include/linux/mfd/pca9450.h
|
+++ linux-imx/include/linux/mfd/pca9450.h
|
||||||
@@ -0,0 +1,355 @@
|
@@ -0,0 +1,355 @@
|
||||||
+/**
|
+/**
|
||||||
+ * @file pca9450.h NXP PCA9450 header file
|
+ * @file pca9450.h NXP PCA9450 header file
|
||||||
|
Loading…
Reference in New Issue
Block a user