tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Olof Johansson:
"Again a set of smaller fixes across several platforms (OMAP, Marvell,
Allwinner, i.MX, etc).

A handful of typo fixes and smaller missing contents from device
trees, with some tweaks to OMAP mach files to deal with CPU feature
print misformatting, potential NULL ptr dereference and one setup
issue with UARTs"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ipmi/bt-bmc: change compatible node to 'aspeed, ast2400-ibt-bmc'
ARM: dts: STiH410-b2260: Fix typo in spi0 chipselect definition
ARM: dts: omap5: board-common: fix wrong SMPS6 (VDD-DDR3) voltage
ARM: omap3: Add missing memory node in SOM-LV
arm64: dts: marvell: add unique identifiers for Armada A8k SPI controllers
arm64: dts: marvell: fix clocksource for CP110 slave SPI0
arm64: dts: marvell: Fix typo in label name on Armada 37xx
ASoC: omap-abe-twl6040: fix typo in bindings documentation
dts: omap5: board-common: enable twl6040 headset jack detection
dts: omap5: board-common: add phandle to reference Palmas gpadc
ARM: OMAP2+: avoid NULL pointer dereference
ARM: OMAP2+: PRM: initialize en_uart4_mask and grpsel_uart4_mask
ARM: dts: omap3: Fix memory node in Torpedo board
ARM: AM43XX: Select OMAP_INTERCONNECT in Kconfig
ARM: OMAP3: Fix formatting of features printed
ARM: dts: imx53-qsb: Fix regulator constraints
ARM: dts: sun8i: fix the pinmux for UART1

Linus Torvalds 77079b13 d117b9ac

+54 -28
+2 -2
Documentation/devicetree/bindings/ipmi/aspeed,ast2400-bt-bmc.txt Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt
··· 6 6 7 7 Required properties: 8 8 9 - - compatible : should be "aspeed,ast2400-bt-bmc" 9 + - compatible : should be "aspeed,ast2400-ibt-bmc" 10 10 - reg: physical address and size of the registers 11 11 12 12 Optional properties: ··· 17 17 Example: 18 18 19 19 ibt@1e789140 { 20 - compatible = "aspeed,ast2400-bt-bmc"; 20 + compatible = "aspeed,ast2400-ibt-bmc"; 21 21 reg = <0x1e789140 0x18>; 22 22 interrupts = <8>; 23 23 };
+1 -1
Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt
··· 12 12 13 13 Optional properties: 14 14 - ti,dmic: phandle for the OMAP dmic node if the machine have it connected 15 - - ti,jack_detection: Need to be present if the board capable to detect jack 15 + - ti,jack-detection: Need to be present if the board capable to detect jack 16 16 insertion, removal. 17 17 18 18 Available audio endpoints for the audio-routing table:
+7 -7
arch/arm/boot/dts/imx53-qsb.dts
··· 64 64 }; 65 65 66 66 ldo3_reg: ldo3 { 67 - regulator-min-microvolt = <600000>; 68 - regulator-max-microvolt = <1800000>; 67 + regulator-min-microvolt = <1725000>; 68 + regulator-max-microvolt = <3300000>; 69 69 regulator-always-on; 70 70 }; 71 71 ··· 76 76 }; 77 77 78 78 ldo5_reg: ldo5 { 79 - regulator-min-microvolt = <1725000>; 80 - regulator-max-microvolt = <3300000>; 79 + regulator-min-microvolt = <1200000>; 80 + regulator-max-microvolt = <3600000>; 81 81 regulator-always-on; 82 82 }; 83 83 ··· 100 100 }; 101 101 102 102 ldo9_reg: ldo9 { 103 - regulator-min-microvolt = <1200000>; 103 + regulator-min-microvolt = <1250000>; 104 104 regulator-max-microvolt = <3600000>; 105 105 regulator-always-on; 106 106 }; 107 107 108 108 ldo10_reg: ldo10 { 109 - regulator-min-microvolt = <1250000>; 110 - regulator-max-microvolt = <3650000>; 109 + regulator-min-microvolt = <1200000>; 110 + regulator-max-microvolt = <3600000>; 111 111 regulator-always-on; 112 112 }; 113 113 };
+5
arch/arm/boot/dts/logicpd-som-lv.dtsi
··· 13 13 }; 14 14 }; 15 15 16 + memory@80000000 { 17 + device_type = "memory"; 18 + reg = <0x80000000 0>; 19 + }; 20 + 16 21 wl12xx_vmmc: wl12xx_vmmc { 17 22 compatible = "regulator-fixed"; 18 23 regulator-name = "vwl1271";
+2 -2
arch/arm/boot/dts/logicpd-torpedo-som.dtsi
··· 13 13 }; 14 14 }; 15 15 16 - memory@0 { 16 + memory@80000000 { 17 17 device_type = "memory"; 18 - reg = <0 0>; 18 + reg = <0x80000000 0>; 19 19 }; 20 20 21 21 leds {
+4 -3
arch/arm/boot/dts/omap5-board-common.dtsi
··· 124 124 compatible = "ti,abe-twl6040"; 125 125 ti,model = "omap5-uevm"; 126 126 127 + ti,jack-detection; 127 128 ti,mclk-freq = <19200000>; 128 129 129 130 ti,mcpdm = <&mcpdm>; ··· 416 415 ti,backup-battery-charge-high-current; 417 416 }; 418 417 419 - gpadc { 418 + gpadc: gpadc { 420 419 compatible = "ti,palmas-gpadc"; 421 420 interrupts = <18 0 422 421 16 0 ··· 476 475 smps6_reg: smps6 { 477 476 /* VDD_DDR3 - over VDD_SMPS6 */ 478 477 regulator-name = "smps6"; 479 - regulator-min-microvolt = <1200000>; 480 - regulator-max-microvolt = <1200000>; 478 + regulator-min-microvolt = <1350000>; 479 + regulator-max-microvolt = <1350000>; 481 480 regulator-always-on; 482 481 regulator-boot-on; 483 482 };
+1 -1
arch/arm/boot/dts/stih410-b2260.dts
··· 74 74 /* Low speed expansion connector */ 75 75 spi0: spi@9844000 { 76 76 label = "LS-SPI0"; 77 - cs-gpio = <&pio30 3 0>; 77 + cs-gpios = <&pio30 3 0>; 78 78 status = "okay"; 79 79 }; 80 80
+4
arch/arm/boot/dts/sun8i-a23-a33.dtsi
··· 282 282 uart1_pins_a: uart1@0 { 283 283 allwinner,pins = "PG6", "PG7"; 284 284 allwinner,function = "uart1"; 285 + allwinner,drive = <SUN4I_PINCTRL_10_MA>; 286 + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; 285 287 }; 286 288 287 289 uart1_pins_cts_rts_a: uart1-cts-rts@0 { 288 290 allwinner,pins = "PG8", "PG9"; 289 291 allwinner,function = "uart1"; 292 + allwinner,drive = <SUN4I_PINCTRL_10_MA>; 293 + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; 290 294 }; 291 295 292 296 mmc0_pins_a: mmc0@0 {
+1
arch/arm/mach-omap2/Kconfig
··· 71 71 select HAVE_ARM_TWD 72 72 select ARM_ERRATA_754322 73 73 select ARM_ERRATA_775420 74 + select OMAP_INTERCONNECT 74 75 75 76 config SOC_DRA7XX 76 77 bool "TI DRA7XX"
+11 -5
arch/arm/mach-omap2/id.c
··· 205 205 206 206 #define OMAP3_SHOW_FEATURE(feat) \ 207 207 if (omap3_has_ ##feat()) \ 208 - printk(#feat" "); 208 + n += scnprintf(buf + n, sizeof(buf) - n, #feat " "); 209 209 210 210 static void __init omap3_cpuinfo(void) 211 211 { 212 212 const char *cpu_name; 213 + char buf[64]; 214 + int n = 0; 215 + 216 + memset(buf, 0, sizeof(buf)); 213 217 214 218 /* 215 219 * OMAP3430 and OMAP3530 are assumed to be same. ··· 245 241 cpu_name = "OMAP3503"; 246 242 } 247 243 248 - sprintf(soc_name, "%s", cpu_name); 244 + scnprintf(soc_name, sizeof(soc_name), "%s", cpu_name); 249 245 250 246 /* Print verbose information */ 251 - pr_info("%s %s (", soc_name, soc_rev); 247 + n += scnprintf(buf, sizeof(buf) - n, "%s %s (", soc_name, soc_rev); 252 248 253 249 OMAP3_SHOW_FEATURE(l2cache); 254 250 OMAP3_SHOW_FEATURE(iva); ··· 256 252 OMAP3_SHOW_FEATURE(neon); 257 253 OMAP3_SHOW_FEATURE(isp); 258 254 OMAP3_SHOW_FEATURE(192mhz_clk); 259 - 260 - printk(")\n"); 255 + if (*(buf + n - 1) == ' ') 256 + n--; 257 + n += scnprintf(buf + n, sizeof(buf) - n, ")\n"); 258 + pr_info("%s", buf); 261 259 } 262 260 263 261 #define OMAP3_CHECK_FEATURE(status,feat) \
+3
arch/arm/mach-omap2/prm3xxx.c
··· 319 319 if (has_uart4) { 320 320 en_uart4_mask = OMAP3630_EN_UART4_MASK; 321 321 grpsel_uart4_mask = OMAP3630_GRPSEL_UART4_MASK; 322 + } else { 323 + en_uart4_mask = 0; 324 + grpsel_uart4_mask = 0; 322 325 } 323 326 324 327 /* Enable wakeups in PER */
+6
arch/arm/mach-omap2/voltage.c
··· 87 87 return -ENODATA; 88 88 } 89 89 90 + if (!voltdm->volt_data) { 91 + pr_err("%s: No voltage data defined for vdd_%s\n", 92 + __func__, voltdm->name); 93 + return -ENODATA; 94 + } 95 + 90 96 /* Adjust voltage to the exact voltage from the OPP table */ 91 97 for (i = 0; voltdm->volt_data[i].volt_nominal != 0; i++) { 92 98 if (voltdm->volt_data[i].volt_nominal >= target_volt) {
+2 -2
arch/arm64/boot/dts/marvell/armada-37xx.dtsi
··· 105 105 status = "disabled"; 106 106 }; 107 107 108 - nb_perih_clk: nb-periph-clk@13000{ 108 + nb_periph_clk: nb-periph-clk@13000 { 109 109 compatible = "marvell,armada-3700-periph-clock-nb"; 110 110 reg = <0x13000 0x100>; 111 111 clocks = <&tbg 0>, <&tbg 1>, <&tbg 2>, ··· 113 113 #clock-cells = <1>; 114 114 }; 115 115 116 - sb_perih_clk: sb-periph-clk@18000{ 116 + sb_periph_clk: sb-periph-clk@18000 { 117 117 compatible = "marvell,armada-3700-periph-clock-sb"; 118 118 reg = <0x18000 0x100>; 119 119 clocks = <&tbg 0>, <&tbg 1>, <&tbg 2>,
+3 -3
arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
··· 130 130 reg = <0x700600 0x50>; 131 131 #address-cells = <0x1>; 132 132 #size-cells = <0x0>; 133 - cell-index = <1>; 134 - clocks = <&cps_syscon0 0 3>; 133 + cell-index = <3>; 134 + clocks = <&cps_syscon0 1 21>; 135 135 status = "disabled"; 136 136 }; 137 137 ··· 140 140 reg = <0x700680 0x50>; 141 141 #address-cells = <1>; 142 142 #size-cells = <0>; 143 - cell-index = <2>; 143 + cell-index = <4>; 144 144 clocks = <&cps_syscon0 1 21>; 145 145 status = "disabled"; 146 146 };
+2 -2
drivers/char/ipmi/bt-bmc.c
··· 484 484 } 485 485 486 486 static const struct of_device_id bt_bmc_match[] = { 487 - { .compatible = "aspeed,ast2400-bt-bmc" }, 487 + { .compatible = "aspeed,ast2400-ibt-bmc" }, 488 488 { }, 489 489 }; 490 490 ··· 502 502 MODULE_DEVICE_TABLE(of, bt_bmc_match); 503 503 MODULE_LICENSE("GPL"); 504 504 MODULE_AUTHOR("Alistair Popple <alistair@popple.id.au>"); 505 - MODULE_DESCRIPTION("Linux device interface to the BT interface"); 505 + MODULE_DESCRIPTION("Linux device interface to the IPMI BT interface");