diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2017-04-02 11:53:42 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-04-02 14:37:49 +0200 |
| commit | 0dcc4d239da78bc20b091d50c097c386e0e61902 (patch) | |
| tree | 47a71ebb1271cb26429c20e34dcad1f8e3d5e945 /target/linux/brcm2708/patches-4.4 | |
| parent | 1adc6db0362d2fdede68a3f1f3a5f119ca39d30a (diff) | |
| download | upstream-0dcc4d239da78bc20b091d50c097c386e0e61902.tar.gz upstream-0dcc4d239da78bc20b091d50c097c386e0e61902.tar.bz2 upstream-0dcc4d239da78bc20b091d50c097c386e0e61902.zip | |
kernel: update kernel 4.4 to 4.4.59
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/brcm2708/patches-4.4')
41 files changed, 77 insertions, 325 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0551-kbuild-add-fno-PIE.patch b/target/linux/brcm2708/patches-4.4/0551-kbuild-add-fno-PIE.patch index 0d2c1a5744..f76490befc 100644 --- a/target/linux/brcm2708/patches-4.4/0551-kbuild-add-fno-PIE.patch +++ b/target/linux/brcm2708/patches-4.4/0551-kbuild-add-fno-PIE.patch @@ -27,8 +27,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Makefile | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/Makefile b/Makefile -index 1099371..c17219e 100644 --- a/Makefile +++ b/Makefile @@ -619,6 +619,8 @@ include arch/$(SRCARCH)/Makefile @@ -39,7 +37,4 @@ index 1099371..c17219e 100644 +KBUILD_AFLAGS += $(call cc-option,-fno-PIE) ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE - KBUILD_CFLAGS += -Os --- -2.1.4 - + KBUILD_CFLAGS += -Os $(EXTRA_OPTIMIZATION) diff --git a/target/linux/brcm2708/patches-4.4/0552-kbuild-Steal-gcc-s-pie-from-the-very-beginning.patch b/target/linux/brcm2708/patches-4.4/0552-kbuild-Steal-gcc-s-pie-from-the-very-beginning.patch index 2361c75e69..ca8ff3d660 100644 --- a/target/linux/brcm2708/patches-4.4/0552-kbuild-Steal-gcc-s-pie-from-the-very-beginning.patch +++ b/target/linux/brcm2708/patches-4.4/0552-kbuild-Steal-gcc-s-pie-from-the-very-beginning.patch @@ -36,8 +36,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Makefile | 2 -- 1 file changed, 2 deletions(-) -diff --git a/Makefile b/Makefile -index c17219e..1099371 100644 --- a/Makefile +++ b/Makefile @@ -619,8 +619,6 @@ include arch/$(SRCARCH)/Makefile @@ -48,7 +46,4 @@ index c17219e..1099371 100644 -KBUILD_AFLAGS += $(call cc-option,-fno-PIE) ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE - KBUILD_CFLAGS += -Os --- -2.1.4 - + KBUILD_CFLAGS += -Os $(EXTRA_OPTIMIZATION) diff --git a/target/linux/brcm2708/patches-4.4/0553-ARM-dts-Restore-dtbs_install-functionality.patch b/target/linux/brcm2708/patches-4.4/0553-ARM-dts-Restore-dtbs_install-functionality.patch index 2fe4b16d6d..f794172db4 100644 --- a/target/linux/brcm2708/patches-4.4/0553-ARM-dts-Restore-dtbs_install-functionality.patch +++ b/target/linux/brcm2708/patches-4.4/0553-ARM-dts-Restore-dtbs_install-functionality.patch @@ -8,8 +8,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> arch/arm/boot/dts/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index cbfc8ba..14a491c 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -806,10 +806,11 @@ dtstree := $(srctree)/$(src) @@ -25,6 +23,3 @@ index cbfc8ba..14a491c 100644 DTC_FLAGS ?= -@ -H epapr + dts-dirs += overlays endif --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0554-BCM270X_DT-Update-UART0-clock-frequency.patch b/target/linux/brcm2708/patches-4.4/0554-BCM270X_DT-Update-UART0-clock-frequency.patch index 3d3f9111a8..73799638fc 100644 --- a/target/linux/brcm2708/patches-4.4/0554-BCM270X_DT-Update-UART0-clock-frequency.patch +++ b/target/linux/brcm2708/patches-4.4/0554-BCM270X_DT-Update-UART0-clock-frequency.patch @@ -16,8 +16,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> arch/arm/boot/dts/bcm2708_common.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/arch/arm/boot/dts/bcm2708_common.dtsi b/arch/arm/boot/dts/bcm2708_common.dtsi -index c449493..a9fd97e 100644 --- a/arch/arm/boot/dts/bcm2708_common.dtsi +++ b/arch/arm/boot/dts/bcm2708_common.dtsi @@ -456,7 +456,7 @@ @@ -29,6 +27,3 @@ index c449493..a9fd97e 100644 }; clk_apb_p: clock@3 { --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0555-BCM2835-v4l2-Fix-a-conformance-test-failure.patch b/target/linux/brcm2708/patches-4.4/0555-BCM2835-v4l2-Fix-a-conformance-test-failure.patch index 68dca0c374..8397e2206d 100644 --- a/target/linux/brcm2708/patches-4.4/0555-BCM2835-v4l2-Fix-a-conformance-test-failure.patch +++ b/target/linux/brcm2708/patches-4.4/0555-BCM2835-v4l2-Fix-a-conformance-test-failure.patch @@ -13,11 +13,9 @@ Format ioctls: drivers/media/platform/bcm2835/bcm2835-camera.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/drivers/media/platform/bcm2835/bcm2835-camera.c b/drivers/media/platform/bcm2835/bcm2835-camera.c -index a2cfff9..23ba458 100644 --- a/drivers/media/platform/bcm2835/bcm2835-camera.c +++ b/drivers/media/platform/bcm2835/bcm2835-camera.c -@@ -1397,6 +1397,7 @@ static int vidioc_s_parm(struct file *file, void *priv, +@@ -1397,6 +1397,7 @@ static int vidioc_s_parm(struct file *fi dev->capture.timeperframe = tpf; parm->parm.capture.timeperframe = tpf; parm->parm.capture.readbuffers = 1; @@ -25,6 +23,3 @@ index a2cfff9..23ba458 100644 fps_param.num = 0; /* Select variable fps, and then use * FPS_RANGE to select the actual limits. --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0556-BCM270X_DT-Add-overlay-for-enc28j60-on-SPI2.patch b/target/linux/brcm2708/patches-4.4/0556-BCM270X_DT-Add-overlay-for-enc28j60-on-SPI2.patch index 8aea6e4ea2..088eb092d9 100644 --- a/target/linux/brcm2708/patches-4.4/0556-BCM270X_DT-Add-overlay-for-enc28j60-on-SPI2.patch +++ b/target/linux/brcm2708/patches-4.4/0556-BCM270X_DT-Add-overlay-for-enc28j60-on-SPI2.patch @@ -11,8 +11,6 @@ Works on SPI2 for compute module 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/overlays/enc28j60-spi2-overlay.dts -diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index 57d60a4..c4186aa 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -28,6 +28,7 @@ dtbo-$(RPI_DT_OVERLAYS) += dpi24.dtbo @@ -23,11 +21,9 @@ index 57d60a4..c4186aa 100644 dtbo-$(RPI_DT_OVERLAYS) += gpio-ir.dtbo dtbo-$(RPI_DT_OVERLAYS) += gpio-poweroff.dtbo dtbo-$(RPI_DT_OVERLAYS) += hifiberry-amp.dtbo -diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 35c0cec1..4a77ee6 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README -@@ -344,13 +344,21 @@ Params: dr_mode Dual role mode: "host", "peripheral" or "otg" +@@ -344,12 +344,20 @@ Params: dr_mode Dual rol Name: enc28j60 @@ -38,7 +34,7 @@ index 35c0cec1..4a77ee6 100644 speed SPI bus speed (default 12000000) - ++ +Name: enc28j60-spi2 +Info: Overlay for the Microchip ENC28J60 Ethernet Controller on SPI2 +Load: dtoverlay=enc28j60-spi2,<param>=<val> @@ -46,13 +42,9 @@ index 35c0cec1..4a77ee6 100644 + + speed SPI bus speed (default 12000000) + -+ + Name: gpio-ir Info: Use GPIO pin as rc-core style infrared receiver input. The rc-core- - based gpio_ir_recv driver maps received keys directly to a -diff --git a/arch/arm/boot/dts/overlays/enc28j60-spi2-overlay.dts b/arch/arm/boot/dts/overlays/enc28j60-spi2-overlay.dts -new file mode 100644 -index 0000000..946c9d2 --- /dev/null +++ b/arch/arm/boot/dts/overlays/enc28j60-spi2-overlay.dts @@ -0,0 +1,47 @@ @@ -103,6 +95,3 @@ index 0000000..946c9d2 + speed = <ð1>, "spi-max-frequency:0"; + }; +}; --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0557-lirc_rpi-Delete-vestigial-gpio_in_pull-parameter.patch b/target/linux/brcm2708/patches-4.4/0557-lirc_rpi-Delete-vestigial-gpio_in_pull-parameter.patch index 9ebcc22239..5a80200305 100644 --- a/target/linux/brcm2708/patches-4.4/0557-lirc_rpi-Delete-vestigial-gpio_in_pull-parameter.patch +++ b/target/linux/brcm2708/patches-4.4/0557-lirc_rpi-Delete-vestigial-gpio_in_pull-parameter.patch @@ -14,8 +14,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> drivers/staging/media/lirc/lirc_rpi.c | 6 ------ 1 file changed, 6 deletions(-) -diff --git a/drivers/staging/media/lirc/lirc_rpi.c b/drivers/staging/media/lirc/lirc_rpi.c -index 6132896..ebbf0d6 100644 --- a/drivers/staging/media/lirc/lirc_rpi.c +++ b/drivers/staging/media/lirc/lirc_rpi.c @@ -64,8 +64,6 @@ @@ -38,6 +36,3 @@ index 6132896..ebbf0d6 100644 module_param(sense, int, S_IRUGO); MODULE_PARM_DESC(sense, "Override autodetection of IR receiver circuit" " (0 = active high, 1 = active low )"); --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0558-BCM270X_DT-Add-i2c-sensor-overlay.patch b/target/linux/brcm2708/patches-4.4/0558-BCM270X_DT-Add-i2c-sensor-overlay.patch index 2248fe8113..3a2f3e6ade 100644 --- a/target/linux/brcm2708/patches-4.4/0558-BCM270X_DT-Add-i2c-sensor-overlay.patch +++ b/target/linux/brcm2708/patches-4.4/0558-BCM270X_DT-Add-i2c-sensor-overlay.patch @@ -15,8 +15,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> 3 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts -diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index c4186aa..bc7f4a9 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -42,6 +42,7 @@ dtbo-$(RPI_DT_OVERLAYS) += i2c-gpio.dtbo @@ -27,11 +25,9 @@ index c4186aa..bc7f4a9 100644 dtbo-$(RPI_DT_OVERLAYS) += i2c0-bcm2708.dtbo dtbo-$(RPI_DT_OVERLAYS) += i2c1-bcm2708.dtbo dtbo-$(RPI_DT_OVERLAYS) += i2s-gpio28-31.dtbo -diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 4a77ee6..80ea3de 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README -@@ -283,8 +283,7 @@ Params: swap_lr Reverse the channel allocation, which will also +@@ -283,8 +283,7 @@ Params: swap_lr Reverse Name: bmp085_i2c-sensor @@ -41,7 +37,7 @@ index 4a77ee6..80ea3de 100644 Load: dtoverlay=bmp085_i2c-sensor Params: <None> -@@ -536,6 +535,15 @@ Params: abx80x Select one of the ABx80x family: +@@ -536,6 +535,15 @@ Params: abx80x Select o source @@ -57,9 +53,6 @@ index 4a77ee6..80ea3de 100644 Name: i2c0-bcm2708 Info: Enable the i2c_bcm2708 driver for the i2c0 bus. Not all pin combinations are usable on all platforms. -diff --git a/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts -new file mode 100644 -index 0000000..f6d134c --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts @@ -0,0 +1,34 @@ @@ -97,6 +90,3 @@ index 0000000..f6d134c + bmp280 = <&bmp280>,"status"; + }; +}; --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0559-BCM270X_DT-overlays-overlay.dtb-overlays-.dtbo-1752.patch b/target/linux/brcm2708/patches-4.4/0559-BCM270X_DT-overlays-overlay.dtb-overlays-.dtbo-1752.patch index 4b40d64260..dfec01b700 100644 --- a/target/linux/brcm2708/patches-4.4/0559-BCM270X_DT-overlays-overlay.dtb-overlays-.dtbo-1752.patch +++ b/target/linux/brcm2708/patches-4.4/0559-BCM270X_DT-overlays-overlay.dtb-overlays-.dtbo-1752.patch @@ -8,8 +8,6 @@ We now create overlays as .dtbo files. arch/arm/boot/dts/overlays/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 80ea3de..7aee1af 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -61,7 +61,7 @@ this becomes a line in config.txt: @@ -21,6 +19,3 @@ index 80ea3de..7aee1af 100644 default it will use GPIOs 17 (out) and 18 (in), but this can be modified using DT parameters: --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0560-Revert-HID-dragonrise-fix-HID-Descriptor-for-0x0006-.patch b/target/linux/brcm2708/patches-4.4/0560-Revert-HID-dragonrise-fix-HID-Descriptor-for-0x0006-.patch index adfb1f6b17..57e52f2a31 100644 --- a/target/linux/brcm2708/patches-4.4/0560-Revert-HID-dragonrise-fix-HID-Descriptor-for-0x0006-.patch +++ b/target/linux/brcm2708/patches-4.4/0560-Revert-HID-dragonrise-fix-HID-Descriptor-for-0x0006-.patch @@ -23,8 +23,6 @@ Signed-off-by: Jiri Kosina <jkosina@suse.cz> drivers/hid/hid-dr.c | 58 ---------------------------------------------------- 1 file changed, 58 deletions(-) -diff --git a/drivers/hid/hid-dr.c b/drivers/hid/hid-dr.c -index 1d78ba3..ce06444 100644 --- a/drivers/hid/hid-dr.c +++ b/drivers/hid/hid-dr.c @@ -234,58 +234,6 @@ static __u8 pid0011_rdesc_fixed[] = { @@ -86,7 +84,7 @@ index 1d78ba3..ce06444 100644 static __u8 *dr_report_fixup(struct hid_device *hdev, __u8 *rdesc, unsigned int *rsize) { -@@ -296,12 +244,6 @@ static __u8 *dr_report_fixup(struct hid_device *hdev, __u8 *rdesc, +@@ -296,12 +244,6 @@ static __u8 *dr_report_fixup(struct hid_ *rsize = sizeof(pid0011_rdesc_fixed); } break; @@ -99,6 +97,3 @@ index 1d78ba3..ce06444 100644 } return rdesc; } --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0561-bcm2835-rng-Avoid-initialising-if-already-enabled.patch b/target/linux/brcm2708/patches-4.4/0561-bcm2835-rng-Avoid-initialising-if-already-enabled.patch index 2892aea656..934bf6f738 100644 --- a/target/linux/brcm2708/patches-4.4/0561-bcm2835-rng-Avoid-initialising-if-already-enabled.patch +++ b/target/linux/brcm2708/patches-4.4/0561-bcm2835-rng-Avoid-initialising-if-already-enabled.patch @@ -8,11 +8,9 @@ Avoids the 0x40000 cycles of warmup again if firmware has already used it drivers/char/hw_random/bcm2835-rng.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -diff --git a/drivers/char/hw_random/bcm2835-rng.c b/drivers/char/hw_random/bcm2835-rng.c -index 7192ec2..2ff49c1 100644 --- a/drivers/char/hw_random/bcm2835-rng.c +++ b/drivers/char/hw_random/bcm2835-rng.c -@@ -62,9 +62,10 @@ static int bcm2835_rng_probe(struct platform_device *pdev) +@@ -62,9 +62,10 @@ static int bcm2835_rng_probe(struct plat bcm2835_rng_ops.priv = (unsigned long)rng_base; /* set warm-up count & enable */ @@ -26,6 +24,3 @@ index 7192ec2..2ff49c1 100644 /* register driver */ err = hwrng_register(&bcm2835_rng_ops); if (err) { --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0562-Pisound-dynamic-overlay-1760.patch b/target/linux/brcm2708/patches-4.4/0562-Pisound-dynamic-overlay-1760.patch index b1aa05f90e..81950dfe06 100644 --- a/target/linux/brcm2708/patches-4.4/0562-Pisound-dynamic-overlay-1760.patch +++ b/target/linux/brcm2708/patches-4.4/0562-Pisound-dynamic-overlay-1760.patch @@ -11,8 +11,6 @@ Print a logline when the kernel module is removed. sound/soc/bcm/pisound.c | 2 + 2 files changed, 52 insertions(+), 44 deletions(-) -diff --git a/arch/arm/boot/dts/overlays/pisound-overlay.dts b/arch/arm/boot/dts/overlays/pisound-overlay.dts -index 7cdfc29..5197e65 100644 --- a/arch/arm/boot/dts/overlays/pisound-overlay.dts +++ b/arch/arm/boot/dts/overlays/pisound-overlay.dts @@ -26,6 +26,54 @@ @@ -133,11 +131,9 @@ index 7cdfc29..5197e65 100644 - }; - }; }; -diff --git a/sound/soc/bcm/pisound.c b/sound/soc/bcm/pisound.c -index a3cd089..30903fcf 100644 --- a/sound/soc/bcm/pisound.c +++ b/sound/soc/bcm/pisound.c -@@ -954,6 +954,8 @@ static int pisnd_probe(struct platform_device *pdev) +@@ -954,6 +954,8 @@ static int pisnd_probe(struct platform_d static int pisnd_remove(struct platform_device *pdev) { @@ -146,6 +142,3 @@ index a3cd089..30903fcf 100644 if (pisnd_kobj) { kobject_put(pisnd_kobj); pisnd_kobj = NULL; --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0563-Add-support-for-Silicon-Labs-Si7013-20-21-humidity-t.patch b/target/linux/brcm2708/patches-4.4/0563-Add-support-for-Silicon-Labs-Si7013-20-21-humidity-t.patch index 574702aa06..a3c86dfbff 100644 --- a/target/linux/brcm2708/patches-4.4/0563-Add-support-for-Silicon-Labs-Si7013-20-21-humidity-t.patch +++ b/target/linux/brcm2708/patches-4.4/0563-Add-support-for-Silicon-Labs-Si7013-20-21-humidity-t.patch @@ -9,11 +9,9 @@ Subject: [PATCH] Add support for Silicon Labs Si7013/20/21 arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts | 49 +++++++++++++---------- 2 files changed, 31 insertions(+), 21 deletions(-) -diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 7aee1af..44ad21f 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README -@@ -543,6 +543,9 @@ Params: bmp085 Select the Bosch sensortronic BMP085 +@@ -543,6 +543,9 @@ Params: bmp085 Select t bmp280 Select the Bosch sensortronic BMP280 @@ -23,8 +21,6 @@ index 7aee1af..44ad21f 100644 Name: i2c0-bcm2708 Info: Enable the i2c_bcm2708 driver for the i2c0 bus. Not all pin combinations -diff --git a/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts -index f6d134c..31bda8d 100644 --- a/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts +++ b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts @@ -1,34 +1,41 @@ @@ -43,26 +39,14 @@ index f6d134c..31bda8d 100644 - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; -+ fragment@0 { -+ target = <&i2c_arm>; -+ __overlay__ { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ status = "okay"; - +- - bmp085: bmp085@77 { - compatible = "bosch,bmp085"; - reg = <0x77>; - default-oversampling = <3>; - status = "disable"; - }; -+ bmp085: bmp085@77 { -+ compatible = "bosch,bmp085"; -+ reg = <0x77>; -+ default-oversampling = <3>; -+ status = "disable"; -+ }; - +- - bmp280: bmp280@76 { - compatible = "bosch,bmp280"; - reg = <0x76>; @@ -70,6 +54,20 @@ index f6d134c..31bda8d 100644 - }; - }; - }; ++ fragment@0 { ++ target = <&i2c_arm>; ++ __overlay__ { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ status = "okay"; ++ ++ bmp085: bmp085@77 { ++ compatible = "bosch,bmp085"; ++ reg = <0x77>; ++ default-oversampling = <3>; ++ status = "disable"; ++ }; ++ + bmp280: bmp280@76 { + compatible = "bosch,bmp280"; + reg = <0x76>; @@ -90,6 +88,3 @@ index f6d134c..31bda8d 100644 + si7020 = <&si7020>,"status"; }; }; --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0564-pisound-improvements-1778.patch b/target/linux/brcm2708/patches-4.4/0564-pisound-improvements-1778.patch index 4b6c569de0..8fe127a433 100644 --- a/target/linux/brcm2708/patches-4.4/0564-pisound-improvements-1778.patch +++ b/target/linux/brcm2708/patches-4.4/0564-pisound-improvements-1778.patch @@ -15,8 +15,6 @@ Signed-off-by: Giedrius Trainavicius <giedrius@blokas.io> sound/soc/bcm/pisound.c | 175 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 154 insertions(+), 21 deletions(-) -diff --git a/sound/soc/bcm/pisound.c b/sound/soc/bcm/pisound.c -index 30903fcf..d317eb9 100644 --- a/sound/soc/bcm/pisound.c +++ b/sound/soc/bcm/pisound.c @@ -36,6 +36,7 @@ @@ -37,7 +35,7 @@ index 30903fcf..d317eb9 100644 DEFINE_KFIFO(spi_fifo_in, uint8_t, FIFO_SIZE); DEFINE_KFIFO(spi_fifo_out, uint8_t, FIFO_SIZE); -@@ -396,8 +400,13 @@ static void pisnd_work_handler(struct work_struct *work) +@@ -396,8 +400,13 @@ static void pisnd_work_handler(struct wo val = 0; tx = 0; @@ -52,7 +50,7 @@ index 30903fcf..d317eb9 100644 rx = spi_transfer16(tx); -@@ -410,6 +419,7 @@ static void pisnd_work_handler(struct work_struct *work) +@@ -410,6 +419,7 @@ static void pisnd_work_handler(struct wo } while (rx != 0 || !kfifo_is_empty(&spi_fifo_out) || pisnd_spi_has_more() @@ -60,7 +58,7 @@ index 30903fcf..d317eb9 100644 ); if (!kfifo_is_empty(&spi_fifo_in) && g_recvCallback) -@@ -569,7 +579,7 @@ static int pisnd_spi_init(struct device *dev) +@@ -569,7 +579,7 @@ static int pisnd_spi_init(struct device } /* Flash the LEDs. */ @@ -84,7 +82,7 @@ index 30903fcf..d317eb9 100644 static void pisnd_spi_send(uint8_t val) { kfifo_put(&spi_fifo_out, val); -@@ -658,6 +676,83 @@ static const struct of_device_id pisound_of_match[] = { +@@ -658,6 +676,83 @@ static const struct of_device_id pisound {}, }; @@ -183,7 +181,7 @@ index 30903fcf..d317eb9 100644 printd("rate = %d\n", params_rate(params)); printd("ch = %d\n", params_channels(params)); printd("bits = %u\n", -@@ -711,16 +814,6 @@ static struct snd_pcm_hw_constraint_list constraints_rates = { +@@ -711,16 +814,6 @@ static struct snd_pcm_hw_constraint_list .mask = 0, }; @@ -200,7 +198,7 @@ index 30903fcf..d317eb9 100644 static int pisnd_startup(struct snd_pcm_substream *substream) { int err = snd_pcm_hw_constraint_list( -@@ -733,11 +826,21 @@ static int pisnd_startup(struct snd_pcm_substream *substream) +@@ -733,11 +826,21 @@ static int pisnd_startup(struct snd_pcm_ if (err < 0) return err; @@ -226,7 +224,7 @@ index 30903fcf..d317eb9 100644 ); if (err < 0) -@@ -771,14 +874,23 @@ static int pisnd_card_probe(struct snd_soc_card *card) +@@ -771,14 +874,23 @@ static int pisnd_card_probe(struct snd_s { int err = pisnd_midi_init(card->snd_card); @@ -294,6 +292,3 @@ index 30903fcf..d317eb9 100644 NULL }; --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0565-Add-driver_name-properties-to-JustBoom-drivers-1787.patch b/target/linux/brcm2708/patches-4.4/0565-Add-driver_name-properties-to-JustBoom-drivers-1787.patch index cee6180111..40f7fe1c38 100644 --- a/target/linux/brcm2708/patches-4.4/0565-Add-driver_name-properties-to-JustBoom-drivers-1787.patch +++ b/target/linux/brcm2708/patches-4.4/0565-Add-driver_name-properties-to-JustBoom-drivers-1787.patch @@ -10,11 +10,9 @@ and other Kodi based OSs sound/soc/bcm/justboom-digi.c | 1 + 2 files changed, 2 insertions(+) -diff --git a/sound/soc/bcm/justboom-dac.c b/sound/soc/bcm/justboom-dac.c -index 8fd50db..05a224e 100644 --- a/sound/soc/bcm/justboom-dac.c +++ b/sound/soc/bcm/justboom-dac.c -@@ -98,6 +98,7 @@ static struct snd_soc_dai_link snd_rpi_justboom_dac_dai[] = { +@@ -98,6 +98,7 @@ static struct snd_soc_dai_link snd_rpi_j /* audio machine driver */ static struct snd_soc_card snd_rpi_justboom_dac = { .name = "snd_rpi_justboom_dac", @@ -22,11 +20,9 @@ index 8fd50db..05a224e 100644 .owner = THIS_MODULE, .dai_link = snd_rpi_justboom_dac_dai, .num_links = ARRAY_SIZE(snd_rpi_justboom_dac_dai), -diff --git a/sound/soc/bcm/justboom-digi.c b/sound/soc/bcm/justboom-digi.c -index 91acb66..abfdc5c 100644 --- a/sound/soc/bcm/justboom-digi.c +++ b/sound/soc/bcm/justboom-digi.c -@@ -154,6 +154,7 @@ static struct snd_soc_dai_link snd_rpi_justboom_digi_dai[] = { +@@ -154,6 +154,7 @@ static struct snd_soc_dai_link snd_rpi_j /* audio machine driver */ static struct snd_soc_card snd_rpi_justboom_digi = { .name = "snd_rpi_justboom_digi", @@ -34,6 +30,3 @@ index 91acb66..abfdc5c 100644 .owner = THIS_MODULE, .dai_link = snd_rpi_justboom_digi_dai, .num_links = ARRAY_SIZE(snd_rpi_justboom_digi_dai), --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0566-bcm2835-i2s-Changes-for-allowing-asymmetric-sample-f.patch b/target/linux/brcm2708/patches-4.4/0566-bcm2835-i2s-Changes-for-allowing-asymmetric-sample-f.patch index e435718882..4605d5d93b 100644 --- a/target/linux/brcm2708/patches-4.4/0566-bcm2835-i2s-Changes-for-allowing-asymmetric-sample-f.patch +++ b/target/linux/brcm2708/patches-4.4/0566-bcm2835-i2s-Changes-for-allowing-asymmetric-sample-f.patch @@ -13,11 +13,9 @@ Signed-off-by: Giedrius Trainavicius <giedrius@blokas.io> sound/soc/bcm/bcm2835-i2s.c | 54 +++++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 16 deletions(-) -diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c -index aedb01f..d2b0801 100644 --- a/sound/soc/bcm/bcm2835-i2s.c +++ b/sound/soc/bcm/bcm2835-i2s.c -@@ -310,6 +310,7 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream, +@@ -310,6 +310,7 @@ static int bcm2835_i2s_hw_params(struct unsigned int sampling_rate = params_rate(params); unsigned int data_length, data_delay, bclk_ratio; unsigned int ch1pos, ch2pos, mode, format; @@ -25,7 +23,7 @@ index aedb01f..d2b0801 100644 unsigned int mash = BCM2835_CLK_MASH_1; unsigned int divi, divf, target_frequency; int clk_src = -1; -@@ -320,6 +321,7 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream, +@@ -320,6 +321,7 @@ static int bcm2835_i2s_hw_params(struct bool frame_master = (master == SND_SOC_DAIFMT_CBS_CFS || master == SND_SOC_DAIFMT_CBM_CFS); uint32_t csreg; @@ -33,7 +31,7 @@ index aedb01f..d2b0801 100644 /* * If a stream is already enabled, -@@ -465,26 +467,46 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream, +@@ -465,26 +467,46 @@ static int bcm2835_i2s_hw_params(struct return -EINVAL; } @@ -96,6 +94,3 @@ index aedb01f..d2b0801 100644 } mode |= BCM2835_I2S_FLEN(bclk_ratio - 1); --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0567-BCM270X_DT-Add-pi3-disable-wifi-overlay.patch b/target/linux/brcm2708/patches-4.4/0567-BCM270X_DT-Add-pi3-disable-wifi-overlay.patch index 13aa1bd659..25c3eb6acf 100644 --- a/target/linux/brcm2708/patches-4.4/0567-BCM270X_DT-Add-pi3-disable-wifi-overlay.patch +++ b/target/linux/brcm2708/patches-4.4/0567-BCM270X_DT-Add-pi3-disable-wifi-overlay.patch @@ -13,8 +13,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> 3 files changed, 20 insertions(+) create mode 100644 arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts -diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index bc7f4a9..05eda03 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -61,6 +61,7 @@ dtbo-$(RPI_DT_OVERLAYS) += mmc.dtbo @@ -25,8 +23,6 @@ index bc7f4a9..05eda03 100644 dtbo-$(RPI_DT_OVERLAYS) += pi3-miniuart-bt.dtbo dtbo-$(RPI_DT_OVERLAYS) += piscreen.dtbo dtbo-$(RPI_DT_OVERLAYS) += piscreen2r.dtbo -diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 44ad21f..adb86bc 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -793,6 +793,12 @@ Load: dtoverlay=pi3-disable-bt @@ -42,9 +38,6 @@ index 44ad21f..adb86bc 100644 Name: pi3-miniuart-bt Info: Switch Pi3 Bluetooth function to use the mini-UART (ttyS0) and restore UART0/ttyAMA0 over GPIOs 14 & 15. Note that this may reduce the maximum -diff --git a/arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts b/arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts -new file mode 100644 -index 0000000..0171995 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts @@ -0,0 +1,13 @@ @@ -61,6 +54,3 @@ index 0000000..0171995 + }; + }; +}; --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0568-configfs-Remove-ppos-increment-in-configfs_write_bin.patch b/target/linux/brcm2708/patches-4.4/0568-configfs-Remove-ppos-increment-in-configfs_write_bin.patch index fcc2d604bf..8cc40da3f2 100644 --- a/target/linux/brcm2708/patches-4.4/0568-configfs-Remove-ppos-increment-in-configfs_write_bin.patch +++ b/target/linux/brcm2708/patches-4.4/0568-configfs-Remove-ppos-increment-in-configfs_write_bin.patch @@ -36,11 +36,9 @@ Cc: Pantelis Antoniou <pantelis.antoniou@konsulko.com> fs/configfs/file.c | 2 -- 1 file changed, 2 deletions(-) -diff --git a/fs/configfs/file.c b/fs/configfs/file.c -index 3687187..6e322f2 100644 --- a/fs/configfs/file.c +++ b/fs/configfs/file.c -@@ -357,8 +357,6 @@ configfs_write_bin_file(struct file *file, const char __user *buf, +@@ -357,8 +357,6 @@ configfs_write_bin_file(struct file *fil len = simple_write_to_buffer(buffer->bin_buffer, buffer->bin_buffer_size, ppos, buf, count); @@ -49,6 +47,3 @@ index 3687187..6e322f2 100644 out: mutex_unlock(&buffer->mutex); return len; --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0569-config-Add-CONFIG_DM_CACHE.patch b/target/linux/brcm2708/patches-4.4/0569-config-Add-CONFIG_DM_CACHE.patch index 929a12a529..fd2ac800f6 100644 --- a/target/linux/brcm2708/patches-4.4/0569-config-Add-CONFIG_DM_CACHE.patch +++ b/target/linux/brcm2708/patches-4.4/0569-config-Add-CONFIG_DM_CACHE.patch @@ -9,8 +9,6 @@ Subject: [PATCH] config: Add CONFIG_DM_CACHE See: arch/arm/configs/bcmrpi_defconfig | 1 + 2 files changed, 2 insertions(+) -diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index c7606f2..0d07eed 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -438,6 +438,7 @@ CONFIG_BLK_DEV_DM=m @@ -21,8 +19,6 @@ index c7606f2..0d07eed 100644 CONFIG_DM_MIRROR=m CONFIG_DM_LOG_USERSPACE=m CONFIG_DM_RAID=m -diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 8121ad2..51640cb 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -431,6 +431,7 @@ CONFIG_BLK_DEV_DM=m @@ -33,6 +29,3 @@ index 8121ad2..51640cb 100644 CONFIG_DM_MIRROR=m CONFIG_DM_LOG_USERSPACE=m CONFIG_DM_RAID=m --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0570-BCM270X_DT-Add-spi0-cs-overlay.patch b/target/linux/brcm2708/patches-4.4/0570-BCM270X_DT-Add-spi0-cs-overlay.patch index 3128cf2fcf..8dee99d8e6 100644 --- a/target/linux/brcm2708/patches-4.4/0570-BCM270X_DT-Add-spi0-cs-overlay.patch +++ b/target/linux/brcm2708/patches-4.4/0570-BCM270X_DT-Add-spi0-cs-overlay.patch @@ -12,8 +12,6 @@ using the cs0_pin and cs1_pin parameters. 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/overlays/spi0-cs-overlay.dts -diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index 05eda03..72f2d90a 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -93,6 +93,7 @@ dtbo-$(RPI_DT_OVERLAYS) += smi-dev.dtbo @@ -24,8 +22,6 @@ index 05eda03..72f2d90a 100644 dtbo-$(RPI_DT_OVERLAYS) += spi0-hw-cs.dtbo dtbo-$(RPI_DT_OVERLAYS) += spi1-1cs.dtbo dtbo-$(RPI_DT_OVERLAYS) += spi1-2cs.dtbo -diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index adb86bc..7f4bd29 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -1131,7 +1131,7 @@ Params: <None> @@ -51,9 +47,6 @@ index adb86bc..7f4bd29 100644 Name: spi0-hw-cs Info: Re-enables hardware CS/CE (chip selects) for SPI0 Load: dtoverlay=spi0-hw-cs -diff --git a/arch/arm/boot/dts/overlays/spi0-cs-overlay.dts b/arch/arm/boot/dts/overlays/spi0-cs-overlay.dts -new file mode 100644 -index 0000000..7f79029 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi0-cs-overlay.dts @@ -0,0 +1,29 @@ @@ -86,6 +79,3 @@ index 0000000..7f79029 + <&frag1>,"cs-gpios:16"; + }; +}; --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0571-Revert-bcm2835-i2s-Changes-for-allowing-asymmetric-s.patch b/target/linux/brcm2708/patches-4.4/0571-Revert-bcm2835-i2s-Changes-for-allowing-asymmetric-s.patch index 3904abbaa3..5fc687455f 100644 --- a/target/linux/brcm2708/patches-4.4/0571-Revert-bcm2835-i2s-Changes-for-allowing-asymmetric-s.patch +++ b/target/linux/brcm2708/patches-4.4/0571-Revert-bcm2835-i2s-Changes-for-allowing-asymmetric-s.patch @@ -13,11 +13,9 @@ See: https://github.com/raspberrypi/linux/issues/1799 sound/soc/bcm/bcm2835-i2s.c | 54 ++++++++++++++------------------------------- 1 file changed, 16 insertions(+), 38 deletions(-) -diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c -index d2b0801..aedb01f 100644 --- a/sound/soc/bcm/bcm2835-i2s.c +++ b/sound/soc/bcm/bcm2835-i2s.c -@@ -310,7 +310,6 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream, +@@ -310,7 +310,6 @@ static int bcm2835_i2s_hw_params(struct unsigned int sampling_rate = params_rate(params); unsigned int data_length, data_delay, bclk_ratio; unsigned int ch1pos, ch2pos, mode, format; @@ -25,7 +23,7 @@ index d2b0801..aedb01f 100644 unsigned int mash = BCM2835_CLK_MASH_1; unsigned int divi, divf, target_frequency; int clk_src = -1; -@@ -321,7 +320,6 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream, +@@ -321,7 +320,6 @@ static int bcm2835_i2s_hw_params(struct bool frame_master = (master == SND_SOC_DAIFMT_CBS_CFS || master == SND_SOC_DAIFMT_CBM_CFS); uint32_t csreg; @@ -33,7 +31,7 @@ index d2b0801..aedb01f 100644 /* * If a stream is already enabled, -@@ -467,46 +465,26 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream, +@@ -467,46 +465,26 @@ static int bcm2835_i2s_hw_params(struct return -EINVAL; } @@ -96,6 +94,3 @@ index d2b0801..aedb01f 100644 } mode |= BCM2835_I2S_FLEN(bclk_ratio - 1); --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0572-BCM270X_DT-Enable-UART0-on-CM3.patch b/target/linux/brcm2708/patches-4.4/0572-BCM270X_DT-Enable-UART0-on-CM3.patch index a28b298941..d9d01343a6 100644 --- a/target/linux/brcm2708/patches-4.4/0572-BCM270X_DT-Enable-UART0-on-CM3.patch +++ b/target/linux/brcm2708/patches-4.4/0572-BCM270X_DT-Enable-UART0-on-CM3.patch @@ -8,8 +8,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> arch/arm/boot/dts/bcm2710-rpi-cm3.dts | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts -index 98e6f92..7ceb16b 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts @@ -7,6 +7,10 @@ @@ -23,6 +21,3 @@ index 98e6f92..7ceb16b 100644 &gpio { sdhost_pins: sdhost_pins { brcm,pins = <48 49 50 51 52 53>; --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0573-config-Add-CONFIG_MD_M25P80-and-CONFIG_MD_SPI_NOR.patch b/target/linux/brcm2708/patches-4.4/0573-config-Add-CONFIG_MD_M25P80-and-CONFIG_MD_SPI_NOR.patch index 8075f6cdaf..b4e34ed028 100644 --- a/target/linux/brcm2708/patches-4.4/0573-config-Add-CONFIG_MD_M25P80-and-CONFIG_MD_SPI_NOR.patch +++ b/target/linux/brcm2708/patches-4.4/0573-config-Add-CONFIG_MD_M25P80-and-CONFIG_MD_SPI_NOR.patch @@ -11,8 +11,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> arch/arm/configs/bcmrpi_defconfig | 2 ++ 2 files changed, 4 insertions(+) -diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 0d07eed..1085058 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -407,7 +407,9 @@ CONFIG_DMA_CMA=y @@ -25,8 +23,6 @@ index 0d07eed..1085058 100644 CONFIG_MTD_UBI=m CONFIG_OF_CONFIGFS=y CONFIG_ZRAM=m -diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index 51640cb..ca52c36 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -400,7 +400,9 @@ CONFIG_DMA_CMA=y @@ -39,6 +35,3 @@ index 51640cb..ca52c36 100644 CONFIG_MTD_UBI=m CONFIG_OF_CONFIGFS=y CONFIG_ZRAM=m --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0574-config-More-USB-config-options-for-bcm2709_defconfig.patch b/target/linux/brcm2708/patches-4.4/0574-config-More-USB-config-options-for-bcm2709_defconfig.patch index f9f3d48c39..81f3ad2d96 100644 --- a/target/linux/brcm2708/patches-4.4/0574-config-More-USB-config-options-for-bcm2709_defconfig.patch +++ b/target/linux/brcm2708/patches-4.4/0574-config-More-USB-config-options-for-bcm2709_defconfig.patch @@ -15,8 +15,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> arch/arm/configs/bcm2709_defconfig | 15 +++++++++++++++ 1 file changed, 15 insertions(+) -diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 1085058..19daca4 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -969,6 +969,7 @@ CONFIG_USB_MICROTEK=m @@ -48,6 +46,3 @@ index 1085058..19daca4 100644 CONFIG_MMC=y CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BCM2835=y --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0575-BCM270X_DT-Add-reference-to-audio_pins-to-CM-dtb.patch b/target/linux/brcm2708/patches-4.4/0575-BCM270X_DT-Add-reference-to-audio_pins-to-CM-dtb.patch index b1d8295620..bd5f5edd08 100644 --- a/target/linux/brcm2708/patches-4.4/0575-BCM270X_DT-Add-reference-to-audio_pins-to-CM-dtb.patch +++ b/target/linux/brcm2708/patches-4.4/0575-BCM270X_DT-Add-reference-to-audio_pins-to-CM-dtb.patch @@ -12,8 +12,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> arch/arm/boot/dts/bcm2708-rpi-cm.dtsi | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi -index 0a3a962..ba0f316 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi @@ -36,6 +36,11 @@ @@ -28,6 +26,3 @@ index 0a3a962..ba0f316 100644 / { __overrides__ { core_freq = <&clk_core>,"clock-frequency:0"; --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0576-Add-overlay-for-mcp3008-adc-1818.patch b/target/linux/brcm2708/patches-4.4/0576-Add-overlay-for-mcp3008-adc-1818.patch index ba30583a00..5da5e8e230 100644 --- a/target/linux/brcm2708/patches-4.4/0576-Add-overlay-for-mcp3008-adc-1818.patch +++ b/target/linux/brcm2708/patches-4.4/0576-Add-overlay-for-mcp3008-adc-1818.patch @@ -43,8 +43,6 @@ dtoverlay=mcp3008:spi0-0-present,spi0-0-speed=2000000 3 files changed, 215 insertions(+) create mode 100755 arch/arm/boot/dts/overlays/mcp3008-overlay.dts -diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index 72f2d90a..b13e340 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -57,6 +57,7 @@ dtbo-$(RPI_DT_OVERLAYS) += mcp23017.dtbo @@ -55,11 +53,9 @@ index 72f2d90a..b13e340 100644 dtbo-$(RPI_DT_OVERLAYS) += mmc.dtbo dtbo-$(RPI_DT_OVERLAYS) += mz61581.dtbo dtbo-$(RPI_DT_OVERLAYS) += pi3-act-led.dtbo -diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README -index 7f4bd29..72601f8 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README -@@ -736,6 +736,15 @@ Params: oscillator Clock frequency for the CAN controller (Hz) +@@ -736,6 +736,15 @@ Params: oscillator Clock fr interrupt GPIO for interrupt signal @@ -75,9 +71,6 @@ index 7f4bd29..72601f8 100644 Name: mmc Info: Selects the bcm2835-mmc SD/MMC driver, optionally with overclock Load: dtoverlay=mmc,<param>=<val> -diff --git a/arch/arm/boot/dts/overlays/mcp3008-overlay.dts b/arch/arm/boot/dts/overlays/mcp3008-overlay.dts -new file mode 100755 -index 0000000..06bf426 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp3008-overlay.dts @@ -0,0 +1,205 @@ @@ -286,6 +279,3 @@ index 0000000..06bf426 + spi2-2-speed = <&mcp3008_22>, "spi-max-frequency:0"; + }; +}; --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0577-x86-ioapic-Restore-IO-APIC-irq_chip-retrigger-callba.patch b/target/linux/brcm2708/patches-4.4/0577-x86-ioapic-Restore-IO-APIC-irq_chip-retrigger-callba.patch index cacfc5d2b4..48aeac9b7b 100644 --- a/target/linux/brcm2708/patches-4.4/0577-x86-ioapic-Restore-IO-APIC-irq_chip-retrigger-callba.patch +++ b/target/linux/brcm2708/patches-4.4/0577-x86-ioapic-Restore-IO-APIC-irq_chip-retrigger-callba.patch @@ -26,11 +26,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> arch/x86/kernel/apic/io_apic.c | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c -index 8ca533b..1e5d2f0 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c -@@ -1875,6 +1875,7 @@ static struct irq_chip ioapic_chip __read_mostly = { +@@ -1875,6 +1875,7 @@ static struct irq_chip ioapic_chip __rea .irq_ack = irq_chip_ack_parent, .irq_eoi = ioapic_ack_level, .irq_set_affinity = ioapic_set_affinity, @@ -38,7 +36,7 @@ index 8ca533b..1e5d2f0 100644 .flags = IRQCHIP_SKIP_SET_WAKE, }; -@@ -1886,6 +1887,7 @@ static struct irq_chip ioapic_ir_chip __read_mostly = { +@@ -1886,6 +1887,7 @@ static struct irq_chip ioapic_ir_chip __ .irq_ack = irq_chip_ack_parent, .irq_eoi = ioapic_ir_ack_level, .irq_set_affinity = ioapic_set_affinity, @@ -46,6 +44,3 @@ index 8ca533b..1e5d2f0 100644 .flags = IRQCHIP_SKIP_SET_WAKE, }; --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0578-config-add-slcan-kernel-module.patch b/target/linux/brcm2708/patches-4.4/0578-config-add-slcan-kernel-module.patch index 4330cb46ab..2a49af1e56 100644 --- a/target/linux/brcm2708/patches-4.4/0578-config-add-slcan-kernel-module.patch +++ b/target/linux/brcm2708/patches-4.4/0578-config-add-slcan-kernel-module.patch @@ -9,8 +9,6 @@ See: https://github.com/raspberrypi/linux/issues/1819 arch/arm/configs/bcmrpi_defconfig | 1 + 2 files changed, 2 insertions(+) -diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 19daca4..783d2c2 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -358,6 +358,7 @@ CONFIG_BAYCOM_SER_HDX=m @@ -21,8 +19,6 @@ index 19daca4..783d2c2 100644 CONFIG_CAN_MCP251X=m CONFIG_IRDA=m CONFIG_IRLAN=m -diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig -index ca52c36..be7bf41 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -351,6 +351,7 @@ CONFIG_BAYCOM_SER_HDX=m @@ -33,6 +29,3 @@ index ca52c36..be7bf41 100644 CONFIG_CAN_MCP251X=m CONFIG_IRDA=m CONFIG_IRLAN=m --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0579-drm-vc4-Fix-sending-of-page-flip-completion-events-i.patch b/target/linux/brcm2708/patches-4.4/0579-drm-vc4-Fix-sending-of-page-flip-completion-events-i.patch index c798546ca0..0c6007e551 100644 --- a/target/linux/brcm2708/patches-4.4/0579-drm-vc4-Fix-sending-of-page-flip-completion-events-i.patch +++ b/target/linux/brcm2708/patches-4.4/0579-drm-vc4-Fix-sending-of-page-flip-completion-events-i.patch @@ -16,11 +16,9 @@ Signed-off-by: Eric Anholt <eric@anholt.net> drivers/gpu/drm/vc4/vc4_firmware_kms.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) -diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -index a1b6511..8f74382 100644 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -@@ -312,6 +312,21 @@ static int vc4_crtc_atomic_check(struct drm_crtc *crtc, +@@ -312,6 +312,21 @@ static int vc4_crtc_atomic_check(struct static void vc4_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_crtc_state *old_state) { @@ -42,6 +40,3 @@ index a1b6511..8f74382 100644 } static void vc4_crtc_handle_page_flip(struct vc4_crtc *vc4_crtc) --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0580-clk-bcm2835-Fix-fixed_divider-of-pllh_aux.patch b/target/linux/brcm2708/patches-4.4/0580-clk-bcm2835-Fix-fixed_divider-of-pllh_aux.patch index c7946e5600..dcc1e822d6 100644 --- a/target/linux/brcm2708/patches-4.4/0580-clk-bcm2835-Fix-fixed_divider-of-pllh_aux.patch +++ b/target/linux/brcm2708/patches-4.4/0580-clk-bcm2835-Fix-fixed_divider-of-pllh_aux.patch @@ -14,11 +14,9 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> drivers/clk/bcm/clk-bcm2835.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index e9e8c25..3fbd2e8 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -1657,7 +1657,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { +@@ -1657,7 +1657,7 @@ static const struct bcm2835_clk_desc clk .a2w_reg = A2W_PLLH_AUX, .load_mask = CM_PLLH_LOADAUX, .hold_mask = 0, @@ -27,6 +25,3 @@ index e9e8c25..3fbd2e8 100644 [BCM2835_PLLH_PIX] = REGISTER_PLL_DIV( .name = "pllh_pix", .source_pll = "pllh", --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0581-clk-bcm-Support-rate-change-propagation-on-bcm2835-c.patch b/target/linux/brcm2708/patches-4.4/0581-clk-bcm-Support-rate-change-propagation-on-bcm2835-c.patch index bd7405e8c6..b973ae1b3d 100644 --- a/target/linux/brcm2708/patches-4.4/0581-clk-bcm-Support-rate-change-propagation-on-bcm2835-c.patch +++ b/target/linux/brcm2708/patches-4.4/0581-clk-bcm-Support-rate-change-propagation-on-bcm2835-c.patch @@ -22,8 +22,6 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> drivers/clk/bcm/clk-bcm2835.c | 67 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 4 deletions(-) -diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 3fbd2e8..5f0e2f3 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -457,6 +457,9 @@ struct bcm2835_clock_data { @@ -98,7 +96,7 @@ index 3fbd2e8..5f0e2f3 100644 struct clk_hw *parent, *best_parent = NULL; bool current_parent_is_pllc; unsigned long rate, best_rate = 0; -@@ -1086,9 +1139,8 @@ static int bcm2835_clock_determine_rate(struct clk_hw *hw, +@@ -1086,9 +1139,8 @@ static int bcm2835_clock_determine_rate( if (bcm2835_clk_is_pllc(parent) && !current_parent_is_pllc) continue; @@ -110,7 +108,7 @@ index 3fbd2e8..5f0e2f3 100644 if (rate > best_rate && rate <= req->rate) { best_parent = parent; best_prate = prate; -@@ -1308,6 +1360,13 @@ static struct clk *bcm2835_register_clock(struct bcm2835_cprman *cprman, +@@ -1308,6 +1360,13 @@ static struct clk *bcm2835_register_cloc if ((cprman_read(cprman, data->ctl_reg) & CM_ENABLE) == 0) init.flags &= ~CLK_IS_CRITICAL; @@ -124,6 +122,3 @@ index 3fbd2e8..5f0e2f3 100644 if (data->is_vpu_clock) { init.ops = &bcm2835_vpu_clock_clk_ops; } else { --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0582-clk-bcm-Allow-rate-change-propagation-to-PLLH_AUX-on.patch b/target/linux/brcm2708/patches-4.4/0582-clk-bcm-Allow-rate-change-propagation-to-PLLH_AUX-on.patch index a66653e17b..c3ab1714e0 100644 --- a/target/linux/brcm2708/patches-4.4/0582-clk-bcm-Allow-rate-change-propagation-to-PLLH_AUX-on.patch +++ b/target/linux/brcm2708/patches-4.4/0582-clk-bcm-Allow-rate-change-propagation-to-PLLH_AUX-on.patch @@ -17,11 +17,9 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> drivers/clk/bcm/clk-bcm2835.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 5f0e2f3..d023e4a 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -1920,7 +1920,12 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { +@@ -1920,7 +1920,12 @@ static const struct bcm2835_clk_desc clk .ctl_reg = CM_VECCTL, .div_reg = CM_VECDIV, .int_bits = 4, @@ -35,6 +33,3 @@ index 5f0e2f3..d023e4a 100644 /* dsi clocks */ [BCM2835_CLOCK_DSI0E] = REGISTER_PER_CLK( --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0583-clk-bcm-Fix-maybe-uninitialized-warning-in-bcm2835_c.patch b/target/linux/brcm2708/patches-4.4/0583-clk-bcm-Fix-maybe-uninitialized-warning-in-bcm2835_c.patch index 5a004a6839..1affce9868 100644 --- a/target/linux/brcm2708/patches-4.4/0583-clk-bcm-Fix-maybe-uninitialized-warning-in-bcm2835_c.patch +++ b/target/linux/brcm2708/patches-4.4/0583-clk-bcm-Fix-maybe-uninitialized-warning-in-bcm2835_c.patch @@ -16,11 +16,9 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> drivers/clk/bcm/clk-bcm2835.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index d023e4a..89dad97 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -1067,7 +1067,7 @@ static unsigned long bcm2835_clock_choose_div_and_prate(struct clk_hw *hw, +@@ -1067,7 +1067,7 @@ static unsigned long bcm2835_clock_choos struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw); struct bcm2835_cprman *cprman = clock->cprman; const struct bcm2835_clock_data *data = clock->data; @@ -29,6 +27,3 @@ index d023e4a..89dad97 100644 u32 curdiv, mindiv, maxdiv; struct clk_hw *parent; --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0584-clk-bcm2835-Don-t-rate-change-PLLs-on-behalf-of-DSI-.patch b/target/linux/brcm2708/patches-4.4/0584-clk-bcm2835-Don-t-rate-change-PLLs-on-behalf-of-DSI-.patch index 94f4be61a1..2a6cfba67a 100644 --- a/target/linux/brcm2708/patches-4.4/0584-clk-bcm2835-Don-t-rate-change-PLLs-on-behalf-of-DSI-.patch +++ b/target/linux/brcm2708/patches-4.4/0584-clk-bcm2835-Don-t-rate-change-PLLs-on-behalf-of-DSI-.patch @@ -21,8 +21,6 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> drivers/clk/bcm/clk-bcm2835.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) -diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 89dad97..54cb4e1 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -449,6 +449,7 @@ struct bcm2835_pll_divider_data { @@ -33,7 +31,7 @@ index 89dad97..54cb4e1 100644 }; struct bcm2835_clock_data { -@@ -1286,7 +1287,7 @@ bcm2835_register_pll_divider(struct bcm2835_cprman *cprman, +@@ -1286,7 +1287,7 @@ bcm2835_register_pll_divider(struct bcm2 init.num_parents = 1; init.name = divider_name; init.ops = &bcm2835_pll_divider_clk_ops; @@ -42,7 +40,7 @@ index 89dad97..54cb4e1 100644 divider = devm_kzalloc(cprman->dev, sizeof(*divider), GFP_KERNEL); if (!divider) -@@ -1525,7 +1526,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { +@@ -1525,7 +1526,8 @@ static const struct bcm2835_clk_desc clk .a2w_reg = A2W_PLLA_CORE, .load_mask = CM_PLLA_LOADCORE, .hold_mask = CM_PLLA_HOLDCORE, @@ -52,7 +50,7 @@ index 89dad97..54cb4e1 100644 [BCM2835_PLLA_PER] = REGISTER_PLL_DIV( .name = "plla_per", .source_pll = "plla", -@@ -1533,7 +1535,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { +@@ -1533,7 +1535,8 @@ static const struct bcm2835_clk_desc clk .a2w_reg = A2W_PLLA_PER, .load_mask = CM_PLLA_LOADPER, .hold_mask = CM_PLLA_HOLDPER, @@ -62,7 +60,7 @@ index 89dad97..54cb4e1 100644 [BCM2835_PLLA_DSI0] = REGISTER_PLL_DIV( .name = "plla_dsi0", .source_pll = "plla", -@@ -1549,7 +1552,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { +@@ -1549,7 +1552,8 @@ static const struct bcm2835_clk_desc clk .a2w_reg = A2W_PLLA_CCP2, .load_mask = CM_PLLA_LOADCCP2, .hold_mask = CM_PLLA_HOLDCCP2, @@ -72,7 +70,7 @@ index 89dad97..54cb4e1 100644 /* PLLB is used for the ARM's clock. */ [BCM2835_PLLB] = REGISTER_PLL( -@@ -1573,7 +1577,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { +@@ -1573,7 +1577,8 @@ static const struct bcm2835_clk_desc clk .a2w_reg = A2W_PLLB_ARM, .load_mask = CM_PLLB_LOADARM, .hold_mask = CM_PLLB_HOLDARM, @@ -82,7 +80,7 @@ index 89dad97..54cb4e1 100644 /* * PLLC is the core PLL, used to drive the core VPU clock. -@@ -1602,7 +1607,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { +@@ -1602,7 +1607,8 @@ static const struct bcm2835_clk_desc clk .a2w_reg = A2W_PLLC_CORE0, .load_mask = CM_PLLC_LOADCORE0, .hold_mask = CM_PLLC_HOLDCORE0, @@ -92,7 +90,7 @@ index 89dad97..54cb4e1 100644 [BCM2835_PLLC_CORE1] = REGISTER_PLL_DIV( .name = "pllc_core1", .source_pll = "pllc", -@@ -1610,7 +1616,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { +@@ -1610,7 +1616,8 @@ static const struct bcm2835_clk_desc clk .a2w_reg = A2W_PLLC_CORE1, .load_mask = CM_PLLC_LOADCORE1, .hold_mask = CM_PLLC_HOLDCORE1, @@ -102,7 +100,7 @@ index 89dad97..54cb4e1 100644 [BCM2835_PLLC_CORE2] = REGISTER_PLL_DIV( .name = "pllc_core2", .source_pll = "pllc", -@@ -1618,7 +1625,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { +@@ -1618,7 +1625,8 @@ static const struct bcm2835_clk_desc clk .a2w_reg = A2W_PLLC_CORE2, .load_mask = CM_PLLC_LOADCORE2, .hold_mask = CM_PLLC_HOLDCORE2, @@ -112,7 +110,7 @@ index 89dad97..54cb4e1 100644 [BCM2835_PLLC_PER] = REGISTER_PLL_DIV( .name = "pllc_per", .source_pll = "pllc", -@@ -1626,7 +1634,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { +@@ -1626,7 +1634,8 @@ static const struct bcm2835_clk_desc clk .a2w_reg = A2W_PLLC_PER, .load_mask = CM_PLLC_LOADPER, .hold_mask = CM_PLLC_HOLDPER, @@ -122,7 +120,7 @@ index 89dad97..54cb4e1 100644 /* * PLLD is the display PLL, used to drive DSI display panels. -@@ -1655,7 +1664,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { +@@ -1655,7 +1664,8 @@ static const struct bcm2835_clk_desc clk .a2w_reg = A2W_PLLD_CORE, .load_mask = CM_PLLD_LOADCORE, .hold_mask = CM_PLLD_HOLDCORE, @@ -132,7 +130,7 @@ index 89dad97..54cb4e1 100644 [BCM2835_PLLD_PER] = REGISTER_PLL_DIV( .name = "plld_per", .source_pll = "plld", -@@ -1663,7 +1673,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { +@@ -1663,7 +1673,8 @@ static const struct bcm2835_clk_desc clk .a2w_reg = A2W_PLLD_PER, .load_mask = CM_PLLD_LOADPER, .hold_mask = CM_PLLD_HOLDPER, @@ -142,7 +140,7 @@ index 89dad97..54cb4e1 100644 [BCM2835_PLLD_DSI0] = REGISTER_PLL_DIV( .name = "plld_dsi0", .source_pll = "plld", -@@ -1708,7 +1719,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { +@@ -1708,7 +1719,8 @@ static const struct bcm2835_clk_desc clk .a2w_reg = A2W_PLLH_RCAL, .load_mask = CM_PLLH_LOADRCAL, .hold_mask = 0, @@ -152,7 +150,7 @@ index 89dad97..54cb4e1 100644 [BCM2835_PLLH_AUX] = REGISTER_PLL_DIV( .name = "pllh_aux", .source_pll = "pllh", -@@ -1716,7 +1728,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { +@@ -1716,7 +1728,8 @@ static const struct bcm2835_clk_desc clk .a2w_reg = A2W_PLLH_AUX, .load_mask = CM_PLLH_LOADAUX, .hold_mask = 0, @@ -162,7 +160,7 @@ index 89dad97..54cb4e1 100644 [BCM2835_PLLH_PIX] = REGISTER_PLL_DIV( .name = "pllh_pix", .source_pll = "pllh", -@@ -1724,7 +1737,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { +@@ -1724,7 +1737,8 @@ static const struct bcm2835_clk_desc clk .a2w_reg = A2W_PLLH_PIX, .load_mask = CM_PLLH_LOADPIX, .hold_mask = 0, @@ -172,6 +170,3 @@ index 89dad97..54cb4e1 100644 /* the clocks */ --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0585-gpio_mem-Remove-unnecessary-dev_info-output-1830.patch b/target/linux/brcm2708/patches-4.4/0585-gpio_mem-Remove-unnecessary-dev_info-output-1830.patch index e4407332ea..2f1ea2a993 100644 --- a/target/linux/brcm2708/patches-4.4/0585-gpio_mem-Remove-unnecessary-dev_info-output-1830.patch +++ b/target/linux/brcm2708/patches-4.4/0585-gpio_mem-Remove-unnecessary-dev_info-output-1830.patch @@ -9,11 +9,9 @@ called, so have removed call completely. drivers/char/broadcom/bcm2835-gpiomem.c | 2 -- 1 file changed, 2 deletions(-) -diff --git a/drivers/char/broadcom/bcm2835-gpiomem.c b/drivers/char/broadcom/bcm2835-gpiomem.c -index 911f5b7..f5e7f1b 100644 --- a/drivers/char/broadcom/bcm2835-gpiomem.c +++ b/drivers/char/broadcom/bcm2835-gpiomem.c -@@ -76,8 +76,6 @@ static int bcm2835_gpiomem_open(struct inode *inode, struct file *file) +@@ -76,8 +76,6 @@ static int bcm2835_gpiomem_open(struct i int dev = iminor(inode); int ret = 0; @@ -22,6 +20,3 @@ index 911f5b7..f5e7f1b 100644 if (dev != DEVICE_MINOR) { dev_err(inst->dev, "Unknown minor device: %d", dev); ret = -ENXIO; --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0586-drm-vc4-Fulfill-user-BO-creation-requests-from-the-k.patch b/target/linux/brcm2708/patches-4.4/0586-drm-vc4-Fulfill-user-BO-creation-requests-from-the-k.patch index 2dab022d12..bc97964f4f 100644 --- a/target/linux/brcm2708/patches-4.4/0586-drm-vc4-Fulfill-user-BO-creation-requests-from-the-k.patch +++ b/target/linux/brcm2708/patches-4.4/0586-drm-vc4-Fulfill-user-BO-creation-requests-from-the-k.patch @@ -20,11 +20,9 @@ Signed-off-by: Eric Anholt <eric@anholt.net> drivers/gpu/drm/vc4/vc4_bo.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) -diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c -index 56b779c..ce8a5fd 100644 --- a/drivers/gpu/drm/vc4/vc4_bo.c +++ b/drivers/gpu/drm/vc4/vc4_bo.c -@@ -208,22 +208,23 @@ struct drm_gem_object *vc4_create_object(struct drm_device *dev, size_t size) +@@ -208,22 +208,23 @@ struct drm_gem_object *vc4_create_object } struct vc4_bo *vc4_bo_create(struct drm_device *dev, size_t unaligned_size, @@ -54,6 +52,3 @@ index 56b779c..ce8a5fd 100644 } /* Otherwise, make a new BO. */ --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0587-drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-.patch b/target/linux/brcm2708/patches-4.4/0587-drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-.patch index c2381cb34b..d5370168b6 100644 --- a/target/linux/brcm2708/patches-4.4/0587-drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-.patch +++ b/target/linux/brcm2708/patches-4.4/0587-drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-.patch @@ -15,11 +15,9 @@ Fixes: c826a6e10644 ("drm/vc4: Add a BO cache.") drivers/gpu/drm/vc4/vc4_bo.c | 8 ++++++++ 1 file changed, 8 insertions(+) -diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c -index ce8a5fd..d7474dd 100644 --- a/drivers/gpu/drm/vc4/vc4_bo.c +++ b/drivers/gpu/drm/vc4/vc4_bo.c -@@ -334,6 +334,14 @@ void vc4_free_object(struct drm_gem_object *gem_bo) +@@ -334,6 +334,14 @@ void vc4_free_object(struct drm_gem_obje goto out; } @@ -34,6 +32,3 @@ index ce8a5fd..d7474dd 100644 cache_list = vc4_get_cache_list_for_size(dev, gem_bo->size); if (!cache_list) { vc4_bo_destroy(bo); --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0588-drm-vc4-Verify-at-boot-that-CMA-doesn-t-cross-a-256M.patch b/target/linux/brcm2708/patches-4.4/0588-drm-vc4-Verify-at-boot-that-CMA-doesn-t-cross-a-256M.patch index d09e6d3ba6..cce4b111e7 100644 --- a/target/linux/brcm2708/patches-4.4/0588-drm-vc4-Verify-at-boot-that-CMA-doesn-t-cross-a-256M.patch +++ b/target/linux/brcm2708/patches-4.4/0588-drm-vc4-Verify-at-boot-that-CMA-doesn-t-cross-a-256M.patch @@ -14,8 +14,6 @@ Signed-off-by: Eric Anholt <eric@anholt.net> mm/cma.c | 2 ++ 3 files changed, 21 insertions(+) -diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c -index e167a1e1..60f5c25 100644 --- a/drivers/base/dma-contiguous.c +++ b/drivers/base/dma-contiguous.c @@ -35,6 +35,7 @@ @@ -26,8 +24,6 @@ index e167a1e1..60f5c25 100644 /* * Default global CMA area size can be defined in kernel's .config. -diff --git a/drivers/gpu/drm/vc4/vc4_v3d.c b/drivers/gpu/drm/vc4/vc4_v3d.c -index 7cc346a..1d9e5a6 100644 --- a/drivers/gpu/drm/vc4/vc4_v3d.c +++ b/drivers/gpu/drm/vc4/vc4_v3d.c @@ -16,7 +16,10 @@ @@ -41,7 +37,7 @@ index 7cc346a..1d9e5a6 100644 #include "linux/pm_runtime.h" #include "vc4_drv.h" #include "vc4_regs.h" -@@ -185,8 +188,23 @@ static int vc4_v3d_bind(struct device *dev, struct device *master, void *data) +@@ -185,8 +188,23 @@ static int vc4_v3d_bind(struct device *d struct drm_device *drm = dev_get_drvdata(master); struct vc4_dev *vc4 = to_vc4_dev(drm); struct vc4_v3d *v3d = NULL; @@ -65,11 +61,9 @@ index 7cc346a..1d9e5a6 100644 v3d = devm_kzalloc(&pdev->dev, sizeof(*v3d), GFP_KERNEL); if (!v3d) return -ENOMEM; -diff --git a/mm/cma.c b/mm/cma.c -index bd0e141..efac29b 100644 --- a/mm/cma.c +++ b/mm/cma.c -@@ -47,11 +47,13 @@ phys_addr_t cma_get_base(const struct cma *cma) +@@ -47,11 +47,13 @@ phys_addr_t cma_get_base(const struct cm { return PFN_PHYS(cma->base_pfn); } @@ -83,6 +77,3 @@ index bd0e141..efac29b 100644 static unsigned long cma_bitmap_aligned_mask(const struct cma *cma, int align_order) --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0589-Update-vfpmodule.c.patch b/target/linux/brcm2708/patches-4.4/0589-Update-vfpmodule.c.patch index 8bdfe2e9d7..97eb130dc1 100644 --- a/target/linux/brcm2708/patches-4.4/0589-Update-vfpmodule.c.patch +++ b/target/linux/brcm2708/patches-4.4/0589-Update-vfpmodule.c.patch @@ -59,11 +59,9 @@ Signed-off-by: Christopher Alexander Tobias Schulze <cat.schulze@alice-dsl.net> arch/arm/vfp/vfpmodule.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) -diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c -index 2a61e4b..7675518 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c -@@ -183,8 +183,11 @@ static int vfp_notifier(struct notifier_block *self, unsigned long cmd, void *v) +@@ -183,8 +183,11 @@ static int vfp_notifier(struct notifier_ * case the thread migrates to a different CPU. The * restoring is done lazily. */ @@ -95,7 +93,7 @@ index 2a61e4b..7675518 100644 vfp_save_state(vfp_current_hw_state[ti->cpu], fpexc); fmxr(FPEXC, fpexc); #endif -@@ -536,7 +542,8 @@ void vfp_sync_hwstate(struct thread_info *thread) +@@ -536,7 +542,8 @@ void vfp_sync_hwstate(struct thread_info /* * Save the last VFP state on this CPU. */ @@ -105,7 +103,7 @@ index 2a61e4b..7675518 100644 vfp_save_state(&thread->vfpstate, fpexc | FPEXC_EN); fmxr(FPEXC, fpexc); } -@@ -608,6 +615,7 @@ int vfp_restore_user_hwstate(struct user_vfp __user *ufp, +@@ -608,6 +615,7 @@ int vfp_restore_user_hwstate(struct user struct vfp_hard_struct *hwstate = &thread->vfpstate.hard; unsigned long fpexc; int err = 0; @@ -113,7 +111,7 @@ index 2a61e4b..7675518 100644 /* Disable VFP to avoid corrupting the new thread state. */ vfp_flush_hwstate(thread); -@@ -631,8 +639,12 @@ int vfp_restore_user_hwstate(struct user_vfp __user *ufp, +@@ -631,8 +639,12 @@ int vfp_restore_user_hwstate(struct user /* Ensure the VFP is enabled. */ fpexc |= FPEXC_EN; @@ -138,6 +136,3 @@ index 2a61e4b..7675518 100644 /* * Save the userland NEON/VFP state. Under UP, --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0590-dwc_otg-fix-summarize-urb-actual_length-for-isochron.patch b/target/linux/brcm2708/patches-4.4/0590-dwc_otg-fix-summarize-urb-actual_length-for-isochron.patch index e799081662..9ce0d3f1f7 100644 --- a/target/linux/brcm2708/patches-4.4/0590-dwc_otg-fix-summarize-urb-actual_length-for-isochron.patch +++ b/target/linux/brcm2708/patches-4.4/0590-dwc_otg-fix-summarize-urb-actual_length-for-isochron.patch @@ -11,11 +11,9 @@ in urb->actual_length. Fixes raspberrypi/linux#903 drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c -index 2ceed42..5011750 100644 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c -@@ -325,10 +325,12 @@ static int _complete(dwc_otg_hcd_t * hcd, void *urb_handle, +@@ -325,10 +325,12 @@ static int _complete(dwc_otg_hcd_t * hcd int i; urb->error_count = dwc_otg_hcd_urb_get_error_count(dwc_otg_urb); @@ -28,6 +26,3 @@ index 2ceed42..5011750 100644 urb->iso_frame_desc[i].status = dwc_otg_hcd_urb_get_iso_desc_status(dwc_otg_urb, i); } --- -2.1.4 - diff --git a/target/linux/brcm2708/patches-4.4/0591-BCM270X_DT-Add-bcm2708-rpi-0-w.dts.patch b/target/linux/brcm2708/patches-4.4/0591-BCM270X_DT-Add-bcm2708-rpi-0-w.dts.patch index b4e18795b2..deb09b62d5 100644 --- a/target/linux/brcm2708/patches-4.4/0591-BCM270X_DT-Add-bcm2708-rpi-0-w.dts.patch +++ b/target/linux/brcm2708/patches-4.4/0591-BCM270X_DT-Add-bcm2708-rpi-0-w.dts.patch @@ -13,8 +13,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> 2 files changed, 201 insertions(+) create mode 100644 arch/arm/boot/dts/bcm2708-rpi-0-w.dts -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 14a491c..bd963ef 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -2,6 +2,7 @@ ifeq ($(CONFIG_OF),y) @@ -25,9 +23,6 @@ index 14a491c..bd963ef 100644 dtb-$(CONFIG_ARCH_BCM2708) += bcm2708-rpi-cm.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-cm.dtb dtb-$(CONFIG_ARCH_BCM2709) += bcm2709-rpi-2-b.dtb -diff --git a/arch/arm/boot/dts/bcm2708-rpi-0-w.dts b/arch/arm/boot/dts/bcm2708-rpi-0-w.dts -new file mode 100644 -index 0000000..9f7de60 --- /dev/null +++ b/arch/arm/boot/dts/bcm2708-rpi-0-w.dts @@ -0,0 +1,200 @@ @@ -231,6 +226,3 @@ index 0000000..9f7de60 + sd_debug = <&sdhost>,"brcm,debug"; + }; +}; --- -2.1.4 - |