Skip to content

RFC: Commits lost between rpi-4.9.y and rpi-4.14.y #2279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 24 commits into from
Nov 21, 2017
Merged

RFC: Commits lost between rpi-4.9.y and rpi-4.14.y #2279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
1187363
BCM_VC_SM: select DMA_SHARED_BUFFER
ali1234 Oct 28, 2017
5ea6907
drm/panel: Add support for the Raspberry Pi 7" Touchscreen.
anholt Apr 26, 2016
b57ae5c
panel-raspberrypi-touchscreen: Fix NULL deref if probe order goes wrong.
anholt Apr 13, 2017
f9d002f
panel-raspberrypi-touchscreen: Round up clk rate to fix DSI panel.
anholt Mar 6, 2017
c6aafc4
BCM270X: Add the DSI panel to the defconfig.
anholt Jun 2, 2016
b2551ad
drm/vc4: Add support for setting DPMS in firmwarekms.
anholt Jul 6, 2017
8ea9f19
drm/vc4: Fix pitch setup for T-format scanout.
anholt Jul 15, 2017
6fb6998
config: Enable CONFIG_BRCMDBG temporarily for debugging
popcornmix Aug 15, 2017
15050dc
brcmfmac: Disable ARP offloading when promiscuous
Aug 24, 2017
197aa85
brcmfmac: Avoid possible out-of-bounds read
Sep 17, 2017
373dd98
brcmfmac: Delete redundant length check
Sep 17, 2017
dea717f
USB_DWCOTG: Disable building dwc_otg as a module (#2265)
pelwell Nov 13, 2017
46a61b3
allo-piano-dac-plus: Master volume added + fixes
Jul 27, 2017
9b1b03a
allo-digione: 192kHz clicking sound fix
Aug 5, 2017
cb46aa2
Fixed a bug when using 352.8kHz sample rate
Oct 17, 2017
35822cf
config: Add CONFIG_GPIO_WATCHDOG=m
Sep 14, 2017
4fe90d4
config: Add CONFIG_W1_SLAVE_DS2438=m
Oct 27, 2017
e75f753
ARM: dts: Add fake CTS signal to pi3-miniuart-bt
Nov 1, 2017
1d99212
mcp2515: Use DT-supplied interrupt flags
Nov 14, 2017
99c8a10
overlays: i2c-rtc: add m41t62
ecc1 Jul 29, 2017
3f30023
BCM270X_DT: Set spidev spi-max-frequency to 125MHz
Aug 16, 2017
18143a3
Revert "hid: Reduce default mouse polling interval to 60Hz"
popcornmix May 24, 2017
28417d5
Include tsl4531, veml6070 and hdc100x dtoverlay (#2252)
ubergesundheit Nov 1, 2017
6e35c26
Tidy up of the ft5406 driver to use DT (#2189)
JamesH65 Nov 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm2708-rpi-0-w.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,15 @@
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
spi-max-frequency = <500000>;
spi-max-frequency = <125000000>;
};

spidev1: spidev@1{
compatible = "spidev";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
spi-max-frequency = <500000>;
spi-max-frequency = <125000000>;
};
};

Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
spi-max-frequency = <500000>;
spi-max-frequency = <125000000>;
};

spidev1: spidev@1{
compatible = "spidev";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
spi-max-frequency = <500000>;
spi-max-frequency = <125000000>;
};
};

Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm2708-rpi-b.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
spi-max-frequency = <500000>;
spi-max-frequency = <125000000>;
};

spidev1: spidev@1{
compatible = "spidev";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
spi-max-frequency = <500000>;
spi-max-frequency = <125000000>;
};
};

Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm2708-rpi-cm.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
spi-max-frequency = <500000>;
spi-max-frequency = <125000000>;
};

spidev1: spidev@1{
compatible = "spidev";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
spi-max-frequency = <500000>;
spi-max-frequency = <125000000>;
};
};

Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm2709-rpi-2-b.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
spi-max-frequency = <500000>;
spi-max-frequency = <125000000>;
};

spidev1: spidev@1{
compatible = "spidev";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
spi-max-frequency = <500000>;
spi-max-frequency = <125000000>;
};
};

Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm2710-rpi-3-b.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,15 @@
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
spi-max-frequency = <500000>;
spi-max-frequency = <125000000>;
};

spidev1: spidev@1{
compatible = "spidev";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
spi-max-frequency = <500000>;
spi-max-frequency = <125000000>;
};
};

Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm2710-rpi-cm3.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
spi-max-frequency = <500000>;
spi-max-frequency = <125000000>;
};

spidev1: spidev@1{
compatible = "spidev";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
spi-max-frequency = <500000>;
spi-max-frequency = <125000000>;
};
};

Expand Down
23 changes: 19 additions & 4 deletions arch/arm/boot/dts/overlays/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,6 +689,8 @@ Params: abx80x Select one of the ABx80x family:

ds3231 Select the DS3231 device

m41t62 Select the M41T62 device

mcp7940x Select the MCP7940x device

mcp7941x Select the MCP7941x device
Expand Down Expand Up @@ -754,8 +756,8 @@ Name: i2c-sensor
Info: Adds support for a number of I2C barometric pressure and temperature
sensors on i2c_arm
Load: dtoverlay=i2c-sensor,<param>=<val>
Params: addr Set the address for the BME280, BMP280, TMP102
or LM75
Params: addr Set the address for the BME280, BMP280, TMP102,
HDC100X or LM75

bme280 Select the Bosch Sensortronic BME280
Valid addresses 0x76-0x77, default 0x76
Expand All @@ -767,6 +769,9 @@ Params: addr Set the address for the BME280, BMP280, TMP102
bmp280 Select the Bosch Sensortronic BMP280
Valid addresses 0x76-0x77, default 0x76

hdc100x Select the Texas Instruments HDC100x temp sensor
Valid addresses 0x40-0x43, default 0x40

htu21 Select the HTU21 temperature and humidity sensor

lm75 Select the Maxim LM75 temperature sensor
Expand All @@ -780,6 +785,12 @@ Params: addr Set the address for the BME280, BMP280, TMP102
tmp102 Select the Texas Instruments TMP102 temp sensor
Valid addresses 0x48-0x4b, default 0x48

tsl4531 Select the AMS TSL4531 digital ambient light
sensor

veml6070 Select the Vishay VEML6070 ultraviolet light
sensor


Name: i2c0-bcm2708
Info: Enable the i2c_bcm2708 driver for the i2c0 bus. Not all pin combinations
Expand Down Expand Up @@ -1288,8 +1299,12 @@ Params: speed Display SPI bus speed

Name: rpi-ft5406
Info: Official Raspberry Pi display touchscreen
Load: dtoverlay=rpi-ft5406
Params: <None>
Load: dtoverlay=rpi-ft5406,<param>=<val>
Params: touchscreen-size-x Touchscreen X resolution (default 800)
touchscreen-size-y Touchscreen Y resolution (default 600);
touchscreen-inverted-x Invert touchscreen X coordinates (default 0);
touchscreen-inverted-y Invert touchscreen Y coordinates (default 0);
touchscreen-swapped-x-y Swap X and Y cordinates (default 0);


Name: rpi-proto
Expand Down
19 changes: 18 additions & 1 deletion arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,21 @@
};
};

fragment@9 {
target = <&i2c_arm>;
__dormant__ {
#address-cells = <1>;
#size-cells = <0>;
status = "okay";

m41t62: m41t62@68 {
compatible = "st,m41t62";
reg = <0x68>;
status = "okay";
};
};
};

__overrides__ {
abx80x = <0>,"+0";
ds1307 = <0>,"+1";
Expand All @@ -153,12 +168,14 @@
pcf2127 = <0>,"+6";
pcf8523 = <0>,"+7";
pcf8563 = <0>,"+8";
m41t62 = <0>,"+9";
trickle-diode-type = <&abx80x>,"abracon,tc-diode";
trickle-resistor-ohms = <&ds1339>,"trickle-resistor-ohms:0",
<&abx80x>,"abracon,tc-resistor";
wakeup-source = <&ds1339>,"wakeup-source?",
<&ds3231>,"wakeup-source?",
<&mcp7940x>,"wakeup-source?",
<&mcp7941x>,"wakeup-source?";
<&mcp7941x>,"wakeup-source?",
<&m41t62>,"wakeup-source?";
};
};
50 changes: 49 additions & 1 deletion arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,54 @@
};
};

fragment@8 {
target = <&i2c_arm>;
__dormant__ {
#address-cells = <1>;
#size-cells = <0>;
status = "okay";

hdc100x: hdc100x@40 {
compatible = "hdc100x";
reg = <0x40>;
status = "okay";
};
};
};

fragment@9 {
target = <&i2c_arm>;
__dormant__ {
#address-cells = <1>;
#size-cells = <0>;
status = "okay";

tsl4531: tsl4531@29 {
compatible = "tsl4531";
reg = <0x29>;
status = "okay";
};
};
};

fragment@10 {
target = <&i2c_arm>;
__dormant__ {
#address-cells = <1>;
#size-cells = <0>;
status = "okay";

veml6070: veml6070@38 {
compatible = "veml6070";
reg = <0x38>;
status = "okay";
};
};
};

__overrides__ {
addr = <&bme280>,"reg:0", <&bmp280>,"reg:0", <&tmp102>,"reg:0",
<&lm75>,"reg:0";
<&lm75>,"reg:0",<&hdc100x>,"reg:0";
bme280 = <0>,"+0";
bmp085 = <0>,"+1";
bmp180 = <0>,"+2";
Expand All @@ -138,5 +183,8 @@
lm75addr = <&lm75>,"reg:0";
si7020 = <0>,"+6";
tmp102 = <0>,"+7";
hdc100x = <0>,"+8";
tsl4531 = <0>,"+9";
veml6070 = <0>,"+10";
};
};
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
pinctrl-0 = <&can0_pins>;
spi-max-frequency = <10000000>;
interrupt-parent = <&gpio>;
interrupts = <25 0x2>;
interrupts = <25 8>; /* IRQ_TYPE_LEVEL_LOW */
clocks = <&can0_osc>;
};
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
pinctrl-0 = <&can1_pins>;
spi-max-frequency = <10000000>;
interrupt-parent = <&gpio>;
interrupts = <25 0x2>;
interrupts = <25 8>; /* IRQ_TYPE_LEVEL_LOW */
clocks = <&can1_osc>;
};
};
Expand Down
12 changes: 11 additions & 1 deletion arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
target = <&uart1>;
__overlay__ {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins &bt_pins>;
pinctrl-0 = <&uart1_pins &bt_pins &fake_bt_cts>;
status = "okay";
};
};
Expand All @@ -55,6 +55,16 @@
};

fragment@4 {
target = <&gpio>;
__overlay__ {
fake_bt_cts: fake_bt_cts {
brcm,pins = <31>;
brcm,function = <1>; /* output */
};
};
};

fragment@5 {
target-path = "/aliases";
__overlay__ {
serial0 = "/soc/serial@7e201000";
Expand Down
13 changes: 13 additions & 0 deletions arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,20 @@
compatible = "rpi,rpi-ft5406";
firmware = <&firmware>;
status = "okay";
touchscreen-size-x = <800>;
touchscreen-size-y = <600>;
touchscreen-inverted-x = <0>;
touchscreen-inverted-y = <0>;
touchscreen-swapped-x-y = <0>;
};
};
};

__overrides__ {
touchscreen-size-x = <&rpi_ft5406>,"touchscreen-size-x:0";
touchscreen-size-y = <&rpi_ft5406>,"touchscreen-size-y:0";
touchscreen-inverted-x = <&rpi_ft5406>,"touchscreen-inverted-x:0";
touchscreen-inverted-y = <&rpi_ft5406>,"touchscreen-inverted-y:0";
touchscreen-swapped-x-y = <&rpi_ft5406>,"touchscreen-swapped-x-y:0";
};
};
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/overlays/spi1-1cs-overlay.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
spi-max-frequency = <500000>;
spi-max-frequency = <125000000>;
status = "okay";
};
};
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/overlays/spi1-2cs-overlay.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
spi-max-frequency = <500000>;
spi-max-frequency = <125000000>;
status = "okay";
};

Expand All @@ -45,7 +45,7 @@
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
spi-max-frequency = <500000>;
spi-max-frequency = <125000000>;
status = "okay";
};
};
Expand Down
Loading