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 Arnd Bergmann:
"Fixes this time include mostly device tree changes, as usual, the
notable ones include:

- A number of patches to fix most of the remaining DTC warnings that
got introduced when DTC started warning about some obvious
mistakes. We still have some remaining warnings that probably may
have to wait until 4.16 to get fixed while we try to figure out
what the correct contents should be.

- On Allwinner A64, Ethernet PHYs need a fix after a mistake in
coordination between patches merged through multiple branches.

- Various fixes for PMICs on allwinner based boards

- Two fixes for ethernet link detection on some Renesas machines

- Two stability fixes for rockchip based boards

Aside from device-tree, two other areas got fixes for older problems:

- For TI Davinci DM365, a couple of fixes were needed to repair the
MMC DMA engine support, apparently this has been broken for a
while.

- One important fix for all Allwinner chips with the PMIC driver as a
loadable module"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
arm64: dts: uniphier: fix gpio-ranges property of PXs3 SoC
arm64: dts: renesas: ulcb: Remove renesas, no-ether-link property
arm64: dts: renesas: salvator-x: Remove renesas, no-ether-link property
ARM: dts: tango4: remove bogus interrupt-controller property
ARM: dts: ls1021a: fix incorrect clock references
ARM: dts: aspeed-g4: Correct VUART IRQ number
ARM: dts: exynos: Enable Mixer node for Exynos5800 Peach Pi machine
ARM: dts: sun8i: a711: Reinstate the PMIC compatible
ARM: davinci: fix mmc entries in dm365's dma_slave_map
ARM: dts: da850-lego-ev3: Fix battery voltage gpio
ARM: davinci: Add dma_mask to dm365's eDMA device
ARM: davinci: Use platform_device_register_full() to create pdev for dm365's eDMA
arm64: dts: rockchip: limit rk3328-rock64 gmac speed to 100MBit for now
arm64: dts: rockchip: remove vdd_log from rk3399-puma
arm64: dts: orange-pi-zero-plus2: fix sdcard detect
arm64: allwinner: a64-sopine: Fix to use dcdc1 regulator instead of vcc3v3
ARM: dts: sunxi: Convert to CCU index macros for HDMI controller
sunxi-rsb: Include OF based modalias in device uevent
ARM: dts: at91: disable the nxp,se97b SMBUS timeout on the TSE-850
arm64: dts: rockchip: fix trailing 0 in rk3328 tsadc interrupts
...

Linus Torvalds e1915c81 00a5ae21

+54 -54
+1 -1
arch/arm/boot/dts/aspeed-g4.dtsi
··· 219 219 compatible = "aspeed,ast2400-vuart"; 220 220 reg = <0x1e787000 0x40>; 221 221 reg-shift = <2>; 222 - interrupts = <10>; 222 + interrupts = <8>; 223 223 clocks = <&clk_uart>; 224 224 no-loopback-test; 225 225 status = "disabled";
+1
arch/arm/boot/dts/at91-tse850-3.dts
··· 221 221 jc42@18 { 222 222 compatible = "nxp,se97b", "jedec,jc-42.4-temp"; 223 223 reg = <0x18>; 224 + smbus-timeout-disable; 224 225 }; 225 226 226 227 dpot: mcp4651-104@28 {
+2 -2
arch/arm/boot/dts/da850-lego-ev3.dts
··· 178 178 */ 179 179 battery { 180 180 pinctrl-names = "default"; 181 - pintctrl-0 = <&battery_pins>; 181 + pinctrl-0 = <&battery_pins>; 182 182 compatible = "lego,ev3-battery"; 183 183 io-channels = <&adc 4>, <&adc 3>; 184 184 io-channel-names = "voltage", "current"; ··· 392 392 batt_volt_en { 393 393 gpio-hog; 394 394 gpios = <6 GPIO_ACTIVE_HIGH>; 395 - output-low; 395 + output-high; 396 396 }; 397 397 }; 398 398
+4
arch/arm/boot/dts/exynos5800-peach-pi.dts
··· 664 664 status = "okay"; 665 665 }; 666 666 667 + &mixer { 668 + status = "okay"; 669 + }; 670 + 667 671 /* eMMC flash */ 668 672 &mmc_0 { 669 673 status = "okay";
+1 -1
arch/arm/boot/dts/ls1021a-qds.dts
··· 215 215 reg = <0x2a>; 216 216 VDDA-supply = <&reg_3p3v>; 217 217 VDDIO-supply = <&reg_3p3v>; 218 - clocks = <&sys_mclk 1>; 218 + clocks = <&sys_mclk>; 219 219 }; 220 220 }; 221 221 };
+1 -1
arch/arm/boot/dts/ls1021a-twr.dts
··· 187 187 reg = <0x0a>; 188 188 VDDA-supply = <&reg_3p3v>; 189 189 VDDIO-supply = <&reg_3p3v>; 190 - clocks = <&sys_mclk 1>; 190 + clocks = <&sys_mclk>; 191 191 }; 192 192 }; 193 193
+4
arch/arm/boot/dts/rk3066a-marsboard.dts
··· 83 83 }; 84 84 }; 85 85 86 + &cpu0 { 87 + cpu0-supply = <&vdd_arm>; 88 + }; 89 + 86 90 &i2c1 { 87 91 status = "okay"; 88 92 clock-frequency = <400000>;
+1 -1
arch/arm/boot/dts/rk3288.dtsi
··· 956 956 iep_mmu: iommu@ff900800 { 957 957 compatible = "rockchip,iommu"; 958 958 reg = <0x0 0xff900800 0x0 0x40>; 959 - interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH 0>; 959 + interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; 960 960 interrupt-names = "iep_mmu"; 961 961 #iommu-cells = <0>; 962 962 status = "disabled";
+2 -2
arch/arm/boot/dts/sun4i-a10.dtsi
··· 502 502 reg = <0x01c16000 0x1000>; 503 503 interrupts = <58>; 504 504 clocks = <&ccu CLK_AHB_HDMI0>, <&ccu CLK_HDMI>, 505 - <&ccu 9>, 506 - <&ccu 18>; 505 + <&ccu CLK_PLL_VIDEO0_2X>, 506 + <&ccu CLK_PLL_VIDEO1_2X>; 507 507 clock-names = "ahb", "mod", "pll-0", "pll-1"; 508 508 dmas = <&dma SUN4I_DMA_NORMAL 16>, 509 509 <&dma SUN4I_DMA_NORMAL 16>,
+2 -2
arch/arm/boot/dts/sun5i-a10s.dtsi
··· 82 82 reg = <0x01c16000 0x1000>; 83 83 interrupts = <58>; 84 84 clocks = <&ccu CLK_AHB_HDMI>, <&ccu CLK_HDMI>, 85 - <&ccu 9>, 86 - <&ccu 16>; 85 + <&ccu CLK_PLL_VIDEO0_2X>, 86 + <&ccu CLK_PLL_VIDEO1_2X>; 87 87 clock-names = "ahb", "mod", "pll-0", "pll-1"; 88 88 dmas = <&dma SUN4I_DMA_NORMAL 16>, 89 89 <&dma SUN4I_DMA_NORMAL 16>,
+2 -2
arch/arm/boot/dts/sun6i-a31.dtsi
··· 429 429 interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>; 430 430 clocks = <&ccu CLK_AHB1_HDMI>, <&ccu CLK_HDMI>, 431 431 <&ccu CLK_HDMI_DDC>, 432 - <&ccu 7>, 433 - <&ccu 13>; 432 + <&ccu CLK_PLL_VIDEO0_2X>, 433 + <&ccu CLK_PLL_VIDEO1_2X>; 434 434 clock-names = "ahb", "mod", "ddc", "pll-0", "pll-1"; 435 435 resets = <&ccu RST_AHB1_HDMI>; 436 436 reset-names = "ahb";
+2 -2
arch/arm/boot/dts/sun7i-a20.dtsi
··· 581 581 reg = <0x01c16000 0x1000>; 582 582 interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>; 583 583 clocks = <&ccu CLK_AHB_HDMI0>, <&ccu CLK_HDMI>, 584 - <&ccu 9>, 585 - <&ccu 18>; 584 + <&ccu CLK_PLL_VIDEO0_2X>, 585 + <&ccu CLK_PLL_VIDEO1_2X>; 586 586 clock-names = "ahb", "mod", "pll-0", "pll-1"; 587 587 dmas = <&dma SUN4I_DMA_NORMAL 16>, 588 588 <&dma SUN4I_DMA_NORMAL 16>,
+1
arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
··· 146 146 status = "okay"; 147 147 148 148 axp81x: pmic@3a3 { 149 + compatible = "x-powers,axp813"; 149 150 reg = <0x3a3>; 150 151 interrupt-parent = <&r_intc>; 151 152 interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
-1
arch/arm/boot/dts/tango4-common.dtsi
··· 156 156 reg = <0x6e000 0x400>; 157 157 ranges = <0 0x6e000 0x400>; 158 158 interrupt-parent = <&gic>; 159 - interrupt-controller; 160 159 #address-cells = <1>; 161 160 #size-cells = <1>; 162 161
+18 -11
arch/arm/mach-davinci/dm365.c
··· 868 868 { "spi_davinci.0", "rx", EDMA_FILTER_PARAM(0, 17) }, 869 869 { "spi_davinci.3", "tx", EDMA_FILTER_PARAM(0, 18) }, 870 870 { "spi_davinci.3", "rx", EDMA_FILTER_PARAM(0, 19) }, 871 - { "dm6441-mmc.0", "rx", EDMA_FILTER_PARAM(0, 26) }, 872 - { "dm6441-mmc.0", "tx", EDMA_FILTER_PARAM(0, 27) }, 873 - { "dm6441-mmc.1", "rx", EDMA_FILTER_PARAM(0, 30) }, 874 - { "dm6441-mmc.1", "tx", EDMA_FILTER_PARAM(0, 31) }, 871 + { "da830-mmc.0", "rx", EDMA_FILTER_PARAM(0, 26) }, 872 + { "da830-mmc.0", "tx", EDMA_FILTER_PARAM(0, 27) }, 873 + { "da830-mmc.1", "rx", EDMA_FILTER_PARAM(0, 30) }, 874 + { "da830-mmc.1", "tx", EDMA_FILTER_PARAM(0, 31) }, 875 875 }; 876 876 877 877 static struct edma_soc_info dm365_edma_pdata = { ··· 925 925 /* not using TC*_ERR */ 926 926 }; 927 927 928 - static struct platform_device dm365_edma_device = { 929 - .name = "edma", 930 - .id = 0, 931 - .dev.platform_data = &dm365_edma_pdata, 932 - .num_resources = ARRAY_SIZE(edma_resources), 933 - .resource = edma_resources, 928 + static const struct platform_device_info dm365_edma_device __initconst = { 929 + .name = "edma", 930 + .id = 0, 931 + .dma_mask = DMA_BIT_MASK(32), 932 + .res = edma_resources, 933 + .num_res = ARRAY_SIZE(edma_resources), 934 + .data = &dm365_edma_pdata, 935 + .size_data = sizeof(dm365_edma_pdata), 934 936 }; 935 937 936 938 static struct resource dm365_asp_resources[] = { ··· 1430 1428 1431 1429 static int __init dm365_init_devices(void) 1432 1430 { 1431 + struct platform_device *edma_pdev; 1433 1432 int ret = 0; 1434 1433 1435 1434 if (!cpu_is_davinci_dm365()) 1436 1435 return 0; 1437 1436 1438 1437 davinci_cfg_reg(DM365_INT_EDMA_CC); 1439 - platform_device_register(&dm365_edma_device); 1438 + edma_pdev = platform_device_register_full(&dm365_edma_device); 1439 + if (IS_ERR(edma_pdev)) { 1440 + pr_warn("%s: Failed to register eDMA\n", __func__); 1441 + return PTR_ERR(edma_pdev); 1442 + } 1440 1443 1441 1444 platform_device_register(&dm365_mdio_device); 1442 1445 platform_device_register(&dm365_emac_device);
+1
arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
··· 75 75 pinctrl-0 = <&rgmii_pins>; 76 76 phy-mode = "rgmii"; 77 77 phy-handle = <&ext_rgmii_phy>; 78 + phy-supply = <&reg_dc1sw>; 78 79 status = "okay"; 79 80 }; 80 81
+1
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
··· 77 77 pinctrl-0 = <&rmii_pins>; 78 78 phy-mode = "rmii"; 79 79 phy-handle = <&ext_rmii_phy1>; 80 + phy-supply = <&reg_dc1sw>; 80 81 status = "okay"; 81 82 82 83 };
+2 -1
arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
··· 82 82 pinctrl-0 = <&rgmii_pins>; 83 83 phy-mode = "rgmii"; 84 84 phy-handle = <&ext_rgmii_phy>; 85 + phy-supply = <&reg_dc1sw>; 85 86 status = "okay"; 86 87 }; 87 88 ··· 96 95 &mmc2 { 97 96 pinctrl-names = "default"; 98 97 pinctrl-0 = <&mmc2_pins>; 99 - vmmc-supply = <&reg_vcc3v3>; 98 + vmmc-supply = <&reg_dcdc1>; 100 99 vqmmc-supply = <&reg_vcc1v8>; 101 100 bus-width = <8>; 102 101 non-removable;
+1 -10
arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
··· 45 45 46 46 #include "sun50i-a64.dtsi" 47 47 48 - / { 49 - reg_vcc3v3: vcc3v3 { 50 - compatible = "regulator-fixed"; 51 - regulator-name = "vcc3v3"; 52 - regulator-min-microvolt = <3300000>; 53 - regulator-max-microvolt = <3300000>; 54 - }; 55 - }; 56 - 57 48 &mmc0 { 58 49 pinctrl-names = "default"; 59 50 pinctrl-0 = <&mmc0_pins>; 60 - vmmc-supply = <&reg_vcc3v3>; 51 + vmmc-supply = <&reg_dcdc1>; 61 52 non-removable; 62 53 disable-wp; 63 54 bus-width = <4>;
+1 -1
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
··· 71 71 pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; 72 72 vmmc-supply = <&reg_vcc3v3>; 73 73 bus-width = <4>; 74 - cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; 74 + cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; 75 75 status = "okay"; 76 76 }; 77 77
-1
arch/arm64/boot/dts/renesas/salvator-common.dtsi
··· 255 255 &avb { 256 256 pinctrl-0 = <&avb_pins>; 257 257 pinctrl-names = "default"; 258 - renesas,no-ether-link; 259 258 phy-handle = <&phy0>; 260 259 status = "okay"; 261 260
-1
arch/arm64/boot/dts/renesas/ulcb.dtsi
··· 145 145 &avb { 146 146 pinctrl-0 = <&avb_pins>; 147 147 pinctrl-names = "default"; 148 - renesas,no-ether-link; 149 148 phy-handle = <&phy0>; 150 149 status = "okay"; 151 150
+2
arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
··· 132 132 assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>; 133 133 assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>; 134 134 clock_in_out = "input"; 135 + /* shows instability at 1GBit right now */ 136 + max-speed = <100>; 135 137 phy-supply = <&vcc_io>; 136 138 phy-mode = "rgmii"; 137 139 pinctrl-names = "default";
+1 -1
arch/arm64/boot/dts/rockchip/rk3328.dtsi
··· 514 514 tsadc: tsadc@ff250000 { 515 515 compatible = "rockchip,rk3328-tsadc"; 516 516 reg = <0x0 0xff250000 0x0 0x100>; 517 - interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH 0>; 517 + interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>; 518 518 assigned-clocks = <&cru SCLK_TSADC>; 519 519 assigned-clock-rates = <50000>; 520 520 clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>;
-11
arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
··· 155 155 regulator-min-microvolt = <5000000>; 156 156 regulator-max-microvolt = <5000000>; 157 157 }; 158 - 159 - vdd_log: vdd-log { 160 - compatible = "pwm-regulator"; 161 - pwms = <&pwm2 0 25000 0>; 162 - regulator-name = "vdd_log"; 163 - regulator-min-microvolt = <800000>; 164 - regulator-max-microvolt = <1400000>; 165 - regulator-always-on; 166 - regulator-boot-on; 167 - status = "okay"; 168 - }; 169 158 }; 170 159 171 160 &cpu_b0 {
+2 -2
arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
··· 198 198 gpio-controller; 199 199 #gpio-cells = <2>; 200 200 gpio-ranges = <&pinctrl 0 0 0>, 201 - <&pinctrl 96 0 0>, 202 - <&pinctrl 160 0 0>; 201 + <&pinctrl 104 0 0>, 202 + <&pinctrl 168 0 0>; 203 203 gpio-ranges-group-names = "gpio_range0", 204 204 "gpio_range1", 205 205 "gpio_range2";
+1
drivers/bus/sunxi-rsb.c
··· 178 178 .match = sunxi_rsb_device_match, 179 179 .probe = sunxi_rsb_device_probe, 180 180 .remove = sunxi_rsb_device_remove, 181 + .uevent = of_device_uevent_modalias, 181 182 }; 182 183 183 184 static void sunxi_rsb_dev_release(struct device *dev)