Merge tag 'tegra-for-4.21-dt-bindings' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Tue, 11 Dec 2018 16:05:17 +0000 (08:05 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 11 Dec 2018 16:05:17 +0000 (08:05 -0800)
dt-bindings: Changes for v4.21-rc1

This contains a few cleanups of and additions to existing device tree
bindings, such as XUSB, EMC, PMC and thermal.

* tag 'tegra-for-4.21-dt-bindings' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  dt-bindings: tegra186-pmc: Add interrupt controller properties
  dt-bindings: thermal: tegra-bpmp: Add Tegra194 support
  dt: bindings: Move tegra20-emc binding to memory-controllers directory
  dt: bindings: tegra20-emc: Document clock property
  dt: bindings: tegra20-emc: Document interrupt property
  dt-bindings: usb: xhci-tegra: Add power-domain details

Signed-off-by: Olof Johansson <olof@lixom.net>
533 files changed:
.mailmap
Documentation/ABI/testing/sysfs-class-led-trigger-pattern
Documentation/devicetree/bindings/arm/amlogic,scpi.txt
Documentation/devicetree/bindings/arm/amlogic.txt
Documentation/devicetree/bindings/arm/renesas,prr.txt [new file with mode: 0644]
Documentation/devicetree/bindings/arm/rockchip.txt
Documentation/devicetree/bindings/arm/shmobile.txt
Documentation/devicetree/bindings/i2c/i2c-omap.txt
Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.txt
Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt
Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt
Documentation/devicetree/bindings/timer/mrvl,mmp-timer.txt
Documentation/devicetree/bindings/vendor-prefixes.txt
Documentation/i2c/busses/i2c-nvidia-gpu [new file with mode: 0644]
Documentation/x86/x86_64/mm.txt
Documentation/x86/zero-page.txt
MAINTAINERS
Makefile
arch/alpha/include/asm/termios.h
arch/alpha/include/uapi/asm/ioctls.h
arch/alpha/include/uapi/asm/termbits.h
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/am3517-evm.dts
arch/arm/boot/dts/am437x-gp-evm.dts
arch/arm/boot/dts/arm-realview-pbx.dtsi
arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts [new file with mode: 0644]
arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts
arch/arm/boot/dts/bcm-nsp.dtsi
arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
arch/arm/boot/dts/bcm2835-rpi-zero.dts
arch/arm/boot/dts/bcm2835-rpi.dtsi
arch/arm/boot/dts/bcm2836-rpi-2-b.dts
arch/arm/boot/dts/bcm2836-rpi.dtsi [new file with mode: 0644]
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
arch/arm/boot/dts/bcm2837-rpi-3-b.dts
arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts [new file with mode: 0644]
arch/arm/boot/dts/bcm47081.dtsi
arch/arm/boot/dts/bcm4709.dtsi
arch/arm/boot/dts/bcm47094.dtsi
arch/arm/boot/dts/bcm47189-tenda-ac9.dts
arch/arm/boot/dts/bcm5301x.dtsi
arch/arm/boot/dts/bcm53573.dtsi
arch/arm/boot/dts/bcm63138.dtsi
arch/arm/boot/dts/bcm958522er.dts
arch/arm/boot/dts/bcm958525er.dts
arch/arm/boot/dts/bcm958525xmc.dts
arch/arm/boot/dts/bcm958622hr.dts
arch/arm/boot/dts/bcm958623hr.dts
arch/arm/boot/dts/bcm958625hr.dts
arch/arm/boot/dts/bcm958625k.dts
arch/arm/boot/dts/bcm963138dvt.dts
arch/arm/boot/dts/bcm988312hr.dts
arch/arm/boot/dts/emev2.dtsi
arch/arm/boot/dts/facebook-bmc-flash-layout.dtsi [new file with mode: 0644]
arch/arm/boot/dts/imx53-ppd.dts
arch/arm/boot/dts/imx6sll.dtsi
arch/arm/boot/dts/imx6sx-sdb.dtsi
arch/arm/boot/dts/iwg20d-q7-common.dtsi
arch/arm/boot/dts/meson.dtsi
arch/arm/boot/dts/meson6-atv1200.dts
arch/arm/boot/dts/meson6.dtsi
arch/arm/boot/dts/meson8-minix-neo-x8.dts
arch/arm/boot/dts/meson8.dtsi
arch/arm/boot/dts/meson8b-mxq.dts
arch/arm/boot/dts/meson8b.dtsi
arch/arm/boot/dts/meson8m2.dtsi
arch/arm/boot/dts/mmp2.dtsi
arch/arm/boot/dts/omap3-gta04.dtsi
arch/arm/boot/dts/pxa27x.dtsi
arch/arm/boot/dts/pxa2xx.dtsi
arch/arm/boot/dts/pxa300-raumfeld-common.dtsi [new file with mode: 0644]
arch/arm/boot/dts/pxa300-raumfeld-connector.dts [new file with mode: 0644]
arch/arm/boot/dts/pxa300-raumfeld-controller.dts [new file with mode: 0644]
arch/arm/boot/dts/pxa300-raumfeld-speaker-l.dts [new file with mode: 0644]
arch/arm/boot/dts/pxa300-raumfeld-speaker-m.dts [new file with mode: 0644]
arch/arm/boot/dts/pxa300-raumfeld-speaker-one.dts [new file with mode: 0644]
arch/arm/boot/dts/pxa300-raumfeld-speaker-s.dts [new file with mode: 0644]
arch/arm/boot/dts/pxa300-raumfeld-tuneable-clock.dtsi [new file with mode: 0644]
arch/arm/boot/dts/pxa3xx.dtsi
arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval-pins.dtsi [deleted file]
arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts [deleted file]
arch/arm/boot/dts/qcom-apq8084.dtsi
arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
arch/arm/boot/dts/qcom-msm8974.dtsi
arch/arm/boot/dts/r8a7740.dtsi
arch/arm/boot/dts/r8a7743-iwg20m.dtsi
arch/arm/boot/dts/r8a7743.dtsi
arch/arm/boot/dts/r8a7744-iwg20d-q7-dbcm-ca.dts [new file with mode: 0644]
arch/arm/boot/dts/r8a7744-iwg20d-q7.dts [new file with mode: 0644]
arch/arm/boot/dts/r8a7744-iwg20m.dtsi [new file with mode: 0644]
arch/arm/boot/dts/r8a7744.dtsi [new file with mode: 0644]
arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts
arch/arm/boot/dts/r8a77470.dtsi
arch/arm/boot/dts/r8a7790-lager.dts
arch/arm/boot/dts/r8a7791-koelsch.dts
arch/arm/boot/dts/r8a7791-porter.dts
arch/arm/boot/dts/r9a06g032.dtsi
arch/arm/boot/dts/rk3066a.dtsi
arch/arm/boot/dts/rk3188.dtsi
arch/arm/boot/dts/rk322x.dtsi
arch/arm/boot/dts/rk3288-rock2-som.dtsi
arch/arm/boot/dts/rk3288-veyron-mickey.dts
arch/arm/boot/dts/rk3288.dtsi
arch/arm/boot/dts/rk3xxx.dtsi
arch/arm/boot/dts/sh73a0.dtsi
arch/arm/boot/dts/socfpga.dtsi
arch/arm/boot/dts/socfpga_arria10.dtsi
arch/arm/boot/dts/socfpga_arria10_socdk.dtsi
arch/arm/boot/dts/socfpga_arria10_socdk_nand.dts
arch/arm/boot/dts/socfpga_arria10_socdk_qspi.dts
arch/arm/boot/dts/socfpga_arria10_socdk_sdmmc.dts
arch/arm/boot/dts/socfpga_arria5.dtsi
arch/arm/boot/dts/socfpga_arria5_socdk.dts
arch/arm/boot/dts/socfpga_cyclone5.dtsi
arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dts
arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi
arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts
arch/arm/boot/dts/socfpga_cyclone5_socdk.dts
arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
arch/arm/boot/dts/socfpga_cyclone5_socrates.dts
arch/arm/boot/dts/socfpga_cyclone5_sodia.dts
arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts
arch/arm/boot/dts/socfpga_vt.dts
arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
arch/arm/boot/dts/vexpress-v2m.dtsi
arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
arch/arm/boot/dts/vexpress-v2p-ca5s.dts
arch/arm/boot/dts/vexpress-v2p-ca9.dts
arch/arm/boot/dts/vf610m4-colibri.dts
arch/arm/configs/multi_v7_defconfig
arch/arm/include/asm/pgtable-2level.h
arch/arm/mach-mmp/mmp2-dt.c
arch/arm/mm/proc-v7.S
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
arch/arm64/boot/dts/amlogic/Makefile
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
arch/arm64/boot/dts/amlogic/meson-axg.dtsi
arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
arch/arm64/boot/dts/amlogic/meson-gx.dtsi
arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts [new file with mode: 0644]
arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dts [new file with mode: 0644]
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
arch/arm64/boot/dts/hisilicon/hi3660.dtsi
arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts
arch/arm64/boot/dts/hisilicon/hi3670.dtsi
arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts
arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
arch/arm64/boot/dts/hisilicon/hi6220.dtsi
arch/arm64/boot/dts/hisilicon/hikey970-pinctrl.dtsi [new file with mode: 0644]
arch/arm64/boot/dts/qcom/Makefile
arch/arm64/boot/dts/qcom/msm8916.dtsi
arch/arm64/boot/dts/qcom/msm8996.dtsi
arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi
arch/arm64/boot/dts/qcom/msm8998-pins.dtsi [new file with mode: 0644]
arch/arm64/boot/dts/qcom/msm8998.dtsi
arch/arm64/boot/dts/qcom/pm8998.dtsi
arch/arm64/boot/dts/qcom/pms405.dtsi [new file with mode: 0644]
arch/arm64/boot/dts/qcom/qcs404-evb-1000.dts [new file with mode: 0644]
arch/arm64/boot/dts/qcom/qcs404-evb-4000.dts [new file with mode: 0644]
arch/arm64/boot/dts/qcom/qcs404-evb.dtsi [new file with mode: 0644]
arch/arm64/boot/dts/qcom/qcs404.dtsi [new file with mode: 0644]
arch/arm64/boot/dts/qcom/sdm845-mtp.dts
arch/arm64/boot/dts/qcom/sdm845.dtsi
arch/arm64/boot/dts/renesas/r8a774a1.dtsi
arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
arch/arm64/boot/dts/renesas/r8a7795.dtsi
arch/arm64/boot/dts/renesas/r8a7796.dtsi
arch/arm64/boot/dts/renesas/r8a77965.dtsi
arch/arm64/boot/dts/renesas/r8a77970.dtsi
arch/arm64/boot/dts/renesas/r8a77980-condor.dts
arch/arm64/boot/dts/renesas/r8a77980.dtsi
arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts
arch/arm64/boot/dts/renesas/r8a77990.dtsi
arch/arm64/boot/dts/renesas/r8a77995-draak.dts
arch/arm64/boot/dts/renesas/r8a77995.dtsi
arch/arm64/boot/dts/renesas/salvator-common.dtsi
arch/arm64/boot/dts/renesas/ulcb.dtsi
arch/arm64/boot/dts/rockchip/Makefile
arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
arch/arm64/boot/dts/rockchip/rk3328.dtsi
arch/arm64/boot/dts/rockchip/rk3368.dtsi
arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-inx.dts [new file with mode: 0644]
arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-kd.dts [new file with mode: 0644]
arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi [new file with mode: 0644]
arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
arch/arm64/boot/dts/rockchip/rk3399.dtsi
arch/arm64/boot/dts/sprd/sc9836.dtsi
arch/arm64/boot/dts/sprd/sc9860.dtsi
arch/arm64/include/asm/processor.h
arch/arm64/mm/init.c
arch/arm64/mm/mmu.c
arch/m68k/include/asm/pgtable_mm.h
arch/microblaze/include/asm/pgtable.h
arch/mips/cavium-octeon/executive/cvmx-helper.c
arch/mips/mm/dma-noncoherent.c
arch/nds32/include/asm/pgtable.h
arch/parisc/include/asm/pgtable.h
arch/s390/Makefile
arch/s390/boot/compressed/Makefile
arch/s390/configs/debug_defconfig
arch/s390/configs/performance_defconfig
arch/s390/defconfig
arch/s390/include/asm/mmu_context.h
arch/s390/include/asm/pgalloc.h
arch/s390/include/asm/pgtable.h
arch/s390/include/asm/processor.h
arch/s390/include/asm/thread_info.h
arch/s390/include/asm/tlb.h
arch/s390/kernel/entry.S
arch/s390/kernel/perf_cpum_cf.c
arch/s390/kernel/perf_cpum_sf.c
arch/s390/kernel/vdso32/Makefile
arch/s390/kernel/vdso64/Makefile
arch/s390/kernel/vmlinux.lds.S
arch/s390/mm/pgalloc.c
arch/s390/numa/numa.c
arch/um/drivers/ubd_kern.c
arch/x86/Kconfig
arch/x86/Makefile
arch/x86/include/asm/mce.h
arch/x86/include/asm/mshyperv.h
arch/x86/include/asm/page_64_types.h
arch/x86/include/asm/pgtable_64_types.h
arch/x86/include/asm/qspinlock.h
arch/x86/include/asm/xen/page.h
arch/x86/kernel/cpu/mcheck/mce.c
arch/x86/kernel/cpu/mshyperv.c
arch/x86/kernel/cpu/vmware.c
arch/x86/kernel/ldt.c
arch/x86/kernel/vsmp_64.c
arch/x86/xen/mmu_pv.c
arch/x86/xen/p2m.c
arch/x86/xen/spinlock.c
block/bio.c
block/blk-lib.c
block/blk-merge.c
block/blk.h
drivers/acpi/nfit/mce.c
drivers/ata/sata_rcar.c
drivers/block/xen-blkfront.c
drivers/clk/clk-fixed-factor.c
drivers/clk/meson/axg.c
drivers/clk/meson/gxbb.c
drivers/clk/qcom/gcc-qcs404.c
drivers/clocksource/i8253.c
drivers/gpu/drm/amd/amdgpu/amdgpu.h
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
drivers/gpu/drm/amd/display/dc/core/dc_link.c
drivers/gpu/drm/amd/display/dc/dc.h
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
drivers/gpu/drm/amd/include/amd_shared.h
drivers/gpu/drm/amd/include/atomfirmware.h
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h
drivers/gpu/drm/amd/powerplay/inc/vega20_ppsmc.h
drivers/gpu/drm/etnaviv/etnaviv_sched.c
drivers/gpu/drm/exynos/exynos5433_drm_decon.c
drivers/gpu/drm/exynos/exynos_drm_crtc.c
drivers/gpu/drm/exynos/exynos_drm_drv.h
drivers/gpu/drm/exynos/exynos_drm_dsi.c
drivers/gpu/drm/exynos/exynos_drm_fbdev.c
drivers/gpu/drm/i915/gvt/gtt.c
drivers/gpu/drm/i915/gvt/gtt.h
drivers/gpu/drm/i915/gvt/handlers.c
drivers/gpu/drm/i915/gvt/mmio_context.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem_execbuffer.c
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/i915_gem_gtt.h
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_audio.c
drivers/gpu/drm/i915/intel_cdclk.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_lpe_audio.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/i915/selftests/huge_pages.c
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
drivers/gpu/drm/sun4i/sun4i_lvds.c
drivers/gpu/drm/sun4i/sun4i_rgb.c
drivers/gpu/drm/sun4i/sun4i_tcon.c
drivers/gpu/vga/vga_switcheroo.c
drivers/hid/hid-alps.c
drivers/hid/hid-asus.c
drivers/hid/hid-ids.h
drivers/hid/hid-quirks.c
drivers/hid/i2c-hid/i2c-hid-core.c
drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c
drivers/hid/usbhid/hiddev.c
drivers/hwmon/hwmon.c
drivers/hwmon/ibmpowernv.c
drivers/i2c/busses/Kconfig
drivers/i2c/busses/Makefile
drivers/i2c/busses/i2c-nvidia-gpu.c [new file with mode: 0644]
drivers/i2c/busses/i2c-qcom-geni.c
drivers/leds/trigger/ledtrig-pattern.c
drivers/mtd/devices/Kconfig
drivers/mtd/maps/sa1100-flash.c
drivers/mtd/nand/raw/nand_base.c
drivers/mtd/spi-nor/cadence-quadspi.c
drivers/mtd/spi-nor/spi-nor.c
drivers/net/bonding/bond_main.c
drivers/net/dsa/microchip/ksz_common.c
drivers/net/dsa/mv88e6xxx/global1.c
drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
drivers/net/ethernet/aquantia/atlantic/aq_hw.h
drivers/net/ethernet/aquantia/atlantic/aq_main.c
drivers/net/ethernet/aquantia/atlantic/aq_nic.c
drivers/net/ethernet/aquantia/atlantic/aq_nic.h
drivers/net/ethernet/aquantia/atlantic/aq_ring.c
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c
drivers/net/ethernet/atheros/alx/alx.h
drivers/net/ethernet/atheros/alx/main.c
drivers/net/ethernet/broadcom/bcmsysport.c
drivers/net/ethernet/broadcom/genet/bcmgenet.c
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
drivers/net/ethernet/ibm/ibmvnic.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/intel/ice/ice.h
drivers/net/ethernet/intel/ice/ice_common.c
drivers/net/ethernet/intel/ice/ice_ethtool.c
drivers/net/ethernet/intel/ice/ice_hw_autogen.h
drivers/net/ethernet/intel/ice/ice_lib.c
drivers/net/ethernet/intel/ice/ice_main.c
drivers/net/ethernet/intel/ice/ice_switch.c
drivers/net/ethernet/intel/ice/ice_switch.h
drivers/net/ethernet/intel/ice/ice_txrx.c
drivers/net/ethernet/intel/ice/ice_txrx.h
drivers/net/ethernet/intel/ice/ice_type.h
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
drivers/net/ethernet/intel/igb/igb_ptp.c
drivers/net/ethernet/marvell/mvneta.c
drivers/net/ethernet/mellanox/mlx4/en_tx.c
drivers/net/ethernet/mellanox/mlxsw/spectrum.c
drivers/net/ethernet/qlogic/qed/qed_fcoe.c
drivers/net/ethernet/qlogic/qed/qed_iscsi.c
drivers/net/ethernet/qlogic/qed/qed_l2.c
drivers/net/ethernet/qlogic/qed/qed_mcp.c
drivers/net/ethernet/qlogic/qed/qed_rdma.c
drivers/net/ethernet/qlogic/qed/qed_roce.c
drivers/net/ethernet/qlogic/qed/qed_sp.h
drivers/net/ethernet/qlogic/qed/qed_sp_commands.c
drivers/net/ethernet/qlogic/qed/qed_spq.c
drivers/net/ethernet/qlogic/qed/qed_sriov.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c
drivers/net/ethernet/stmicro/stmmac/common.h
drivers/net/ethernet/stmicro/stmmac/descs_com.h
drivers/net/ethernet/stmicro/stmmac/enh_desc.c
drivers/net/ethernet/stmicro/stmmac/ring_mode.c
drivers/net/fddi/defza.c
drivers/net/fddi/defza.h
drivers/net/phy/broadcom.c
drivers/net/phy/realtek.c
drivers/net/usb/smsc95xx.c
drivers/nvme/host/core.c
drivers/nvme/host/multipath.c
drivers/nvme/target/core.c
drivers/nvme/target/rdma.c
drivers/of/device.c
drivers/of/of_numa.c
drivers/s390/net/qeth_core.h
drivers/s390/net/qeth_core_main.c
drivers/s390/net/qeth_core_mpc.h
drivers/s390/net/qeth_l2_main.c
drivers/s390/net/qeth_l3_main.c
drivers/tty/serial/sh-sci.c
drivers/tty/tty_baudrate.c
drivers/tty/vt/vt.c
drivers/usb/typec/ucsi/Kconfig
drivers/usb/typec/ucsi/Makefile
drivers/usb/typec/ucsi/ucsi_ccg.c [new file with mode: 0644]
drivers/xen/grant-table.c
drivers/xen/privcmd-buf.c
fs/btrfs/ctree.h
fs/btrfs/disk-io.c
fs/btrfs/free-space-cache.c
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/btrfs/super.c
fs/btrfs/tree-checker.c
fs/btrfs/tree-log.c
fs/ceph/file.c
fs/ceph/mds_client.c
fs/ceph/quota.c
fs/ext4/inode.c
fs/ext4/namei.c
fs/ext4/resize.c
fs/ext4/super.c
fs/ext4/xattr.c
fs/namespace.c
fs/xfs/libxfs/xfs_attr_leaf.c
fs/xfs/xfs_ioctl.c
fs/xfs/xfs_message.c
include/asm-generic/4level-fixup.h
include/asm-generic/5level-fixup.h
include/asm-generic/pgtable-nop4d-hack.h
include/asm-generic/pgtable-nop4d.h
include/asm-generic/pgtable-nopmd.h
include/asm-generic/pgtable-nopud.h
include/asm-generic/pgtable.h
include/dt-bindings/power/rk3066-power.h [new file with mode: 0644]
include/dt-bindings/power/rk3188-power.h [new file with mode: 0644]
include/linux/ceph/ceph_features.h
include/linux/compiler-gcc.h
include/linux/compiler.h
include/linux/compiler_attributes.h
include/linux/compiler_types.h
include/linux/hid.h
include/linux/i8253.h
include/linux/mm.h
include/linux/mtd/nand.h
include/linux/netdevice.h
include/linux/netfilter/ipset/ip_set.h
include/linux/netfilter/ipset/ip_set_comment.h
include/linux/nmi.h
include/net/addrconf.h
include/net/if_inet6.h
include/net/netfilter/nf_conntrack_l4proto.h
include/uapi/linux/kfd_ioctl.h
include/uapi/linux/netfilter/nf_tables.h
include/uapi/linux/netfilter_bridge.h
include/uapi/linux/sctp.h
include/xen/xen-ops.h
kernel/bpf/core.c
kernel/bpf/syscall.c
kernel/resource.c
kernel/sched/core.c
kernel/sched/fair.c
kernel/time/posix-cpu-timers.c
kernel/trace/trace_probe.c
kernel/user_namespace.c
lib/raid6/test/Makefile
net/core/dev.c
net/core/flow_dissector.c
net/core/netpoll.c
net/core/rtnetlink.c
net/core/skbuff.c
net/core/sock.c
net/ipv4/inet_fragment.c
net/ipv4/ip_fragment.c
net/ipv4/ip_sockglue.c
net/ipv6/af_inet6.c
net/ipv6/anycast.c
net/ipv6/ip6_fib.c
net/ipv6/netfilter/nf_conntrack_reasm.c
net/netfilter/ipset/ip_set_core.c
net/netfilter/ipset/ip_set_hash_netportnet.c
net/netfilter/ipset/ip_set_list_set.c
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_proto_dccp.c
net/netfilter/nf_conntrack_proto_generic.c
net/netfilter/nf_conntrack_proto_icmp.c
net/netfilter/nf_conntrack_proto_icmpv6.c
net/netfilter/nf_conntrack_proto_sctp.c
net/netfilter/nf_conntrack_proto_tcp.c
net/netfilter/nf_conntrack_proto_udp.c
net/netfilter/nfnetlink_cttimeout.c
net/netfilter/nft_compat.c
net/netfilter/nft_numgen.c
net/netfilter/nft_osf.c
net/netfilter/xt_IDLETIMER.c
net/openvswitch/conntrack.c
net/rxrpc/ar-internal.h
net/rxrpc/call_event.c
net/rxrpc/output.c
net/sched/act_mirred.c
net/sched/cls_flower.c
net/sched/sch_netem.c
net/sctp/outqueue.c
net/tipc/link.c
scripts/kconfig/merge_config.sh
scripts/package/builddeb
scripts/package/mkdebian
scripts/package/mkspec
scripts/setlocalversion
sound/pci/hda/thinkpad_helper.c
tools/arch/arm64/include/asm/barrier.h
tools/perf/Documentation/perf-list.txt
tools/perf/Makefile.perf
tools/perf/builtin-record.c
tools/perf/builtin-stat.c
tools/perf/builtin-top.c
tools/perf/builtin-trace.c
tools/perf/examples/bpf/augmented_raw_syscalls.c [new file with mode: 0644]
tools/perf/jvmti/jvmti_agent.c
tools/perf/scripts/python/exported-sql-viewer.py
tools/perf/tests/attr/test-record-group-sampling
tools/perf/util/evlist.c
tools/perf/util/evlist.h
tools/perf/util/evsel.c
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
tools/perf/util/intel-pt-decoder/intel-pt-log.c
tools/perf/util/intel-pt-decoder/intel-pt-log.h
tools/perf/util/intel-pt.c
tools/perf/util/pmu.c

index a76be45fef6ca5b2d23139304ff5ea338bdd1d07..28fecafa65069c1af077453a4159a6a290949982 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -159,6 +159,7 @@ Peter Oruba <peter@oruba.de>
 Peter Oruba <peter.oruba@amd.com>
 Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
 Praveen BP <praveenbp@ti.com>
+Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>
 Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>
 Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>
 Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>
index fb3d1e03b8819bb950e961172d27dac3a3191129..1e5d172e064624d96216eae51a4be60c02a29979 100644 (file)
@@ -37,8 +37,8 @@ Description:
                  0-|   /             \/             \/
                    +---0----1----2----3----4----5----6------------> time (s)
 
-               2. To make the LED go instantly from one brigntess value to another,
-               we should use use zero-time lengths (the brightness must be same as
+               2. To make the LED go instantly from one brightness value to another,
+               we should use zero-time lengths (the brightness must be same as
                the previous tuple's). So the format should be:
                "brightness_1 duration_1 brightness_1 0 brightness_2 duration_2
                brightness_2 0 ...". For example:
index 7b9a861e9306dbf705f19af8bec94f46b011fcb1..5ab59da052df72e963183810ad4df32fb0164cb9 100644 (file)
@@ -17,4 +17,11 @@ Required sub-node properties:
 - compatible : should be "amlogic,meson-gxbb-scp-shmem" for SRAM based shared
                memory on Amlogic GXBB SoC.
 
+Sensor bindings for the sensors based on SCPI Message Protocol
+--------------------------------------------------------------
+SCPI provides an API to access the various sensors on the SoC.
+
+Required properties:
+- compatible : should be "amlogic,meson-gxbb-scpi-sensors".
+
 [0] Documentation/devicetree/bindings/arm/arm,scpi.txt
index 4498292b833d0c63b42b9eef486f2467649e0ae4..8dbc259081e405d100cc219fe459e11bc5325acf 100644 (file)
@@ -91,8 +91,10 @@ Board compatible values (alphabetically, grouped by SoC):
 
   - "amlogic,p230" (Meson gxl s905d)
   - "amlogic,p231" (Meson gxl s905d)
+  - "phicomm,n1" (Meson gxl s905d)
 
   - "amlogic,p241" (Meson gxl s805x)
+  - "libretech,aml-s805x-ac" (Meson gxl s805x)
 
   - "amlogic,p281" (Meson gxl s905w)
   - "oranth,tx3-mini" (Meson gxl s905w)
diff --git a/Documentation/devicetree/bindings/arm/renesas,prr.txt b/Documentation/devicetree/bindings/arm/renesas,prr.txt
new file mode 100644 (file)
index 0000000..08e482e
--- /dev/null
@@ -0,0 +1,20 @@
+Renesas Product Register
+
+Most Renesas ARM SoCs have a Product Register or Boundary Scan ID Register that
+allows to retrieve SoC product and revision information.  If present, a device
+node for this register should be added.
+
+Required properties:
+  - compatible: Must be one of:
+    "renesas,prr"
+    "renesas,bsid"
+  - reg: Base address and length of the register block.
+
+
+Examples
+--------
+
+       prr: chipid@ff000044 {
+               compatible = "renesas,prr";
+               reg = <0 0xff000044 0 4>;
+       };
index 0cc71236d639c5b0ee234ec3bd960ab732fa7071..7ce7382fedd844bf9060b4a16ededba2d2eedc47 100644 (file)
@@ -152,6 +152,40 @@ Rockchip platforms device tree bindings
       - compatible = "google,veyron-pinky-rev2", "google,veyron-pinky",
                     "google,veyron", "rockchip,rk3288";
 
+- Google Scarlet - with display from Kingdisplay
+    Required root node properties:
+      - compatible = "google,scarlet-rev15-sku7", "google,scarlet-rev15",
+                    "google,scarlet-rev14-sku7", "google,scarlet-rev14",
+                    "google,scarlet-rev13-sku7", "google,scarlet-rev13",
+                    "google,scarlet-rev12-sku7", "google,scarlet-rev12",
+                    "google,scarlet-rev11-sku7", "google,scarlet-rev11",
+                    "google,scarlet-rev10-sku7", "google,scarlet-rev10",
+                    "google,scarlet-rev9-sku7",  "google,scarlet-rev9",
+                    "google,scarlet-rev8-sku7",  "google,scarlet-rev8",
+                    "google,scarlet-rev7-sku7",  "google,scarlet-rev7",
+                    "google,scarlet-rev6-sku7",  "google,scarlet-rev6",
+                    "google,scarlet-rev5-sku7",  "google,scarlet-rev5",
+                    "google,scarlet-rev4-sku7",  "google,scarlet-rev4",
+                    "google,scarlet-rev3-sku7",  "google,scarlet-rev3",
+                    "google,scarlet", "google,gru", "rockchip,rk3399";
+
+- Google Scarlet - with display from Innolux
+    Required root node properties:
+      - compatible = "google,scarlet-rev15-sku6", "google,scarlet-rev15",
+                    "google,scarlet-rev14-sku6", "google,scarlet-rev14",
+                    "google,scarlet-rev13-sku6", "google,scarlet-rev13",
+                    "google,scarlet-rev12-sku6", "google,scarlet-rev12",
+                    "google,scarlet-rev11-sku6", "google,scarlet-rev11",
+                    "google,scarlet-rev10-sku6", "google,scarlet-rev10",
+                    "google,scarlet-rev9-sku6",  "google,scarlet-rev9",
+                    "google,scarlet-rev8-sku6",  "google,scarlet-rev8",
+                    "google,scarlet-rev7-sku6",  "google,scarlet-rev7",
+                    "google,scarlet-rev6-sku6",  "google,scarlet-rev6",
+                    "google,scarlet-rev5-sku6",  "google,scarlet-rev5",
+                    "google,scarlet-rev4-sku6",  "google,scarlet-rev4",
+                    "google,scarlet", "google,gru", "rockchip,rk3399";
+
+
 - Google Speedy (Asus C201 Chromebook):
     Required root node properties:
       - compatible = "google,veyron-speedy-rev9", "google,veyron-speedy-rev8",
index f5e0f82fd5031efb1570361eabf2d096769ef7f5..7f91c2a8b54eec43fe9e0aad3079df4798ff5642 100644 (file)
@@ -27,7 +27,7 @@ SoCs:
     compatible = "renesas,r8a77470"
   - RZ/G2M (R8A774A1)
     compatible = "renesas,r8a774a1"
-  - RZ/G2E (RA8774C0)
+  - RZ/G2E (R8A774C0)
     compatible = "renesas,r8a774c0"
   - R-Car M1A (R8A77781)
     compatible = "renesas,r8a7778"
@@ -101,6 +101,10 @@ Boards:
     compatible = "iwave,g20d", "iwave,g20m", "renesas,r8a7743"
   - iWave Systems RZ/G1M Qseven System On Module (iW-RainboW-G20M-Qseven)
     compatible = "iwave,g20m", "renesas,r8a7743"
+  - iWave Systems RZ/G1N Qseven Development Platform (iW-RainboW-G20D-Qseven)
+    compatible = "iwave,g20d", "iwave,g20m", "renesas,r8a7744"
+  - iWave Systems RZ/G1N Qseven System On Module (iW-RainboW-G20M-Qseven)
+    compatible = "iwave,g20m", "renesas,r8a7744"
   - Kingfisher (SBEV-RCAR-KF-M03)
     compatible = "shimafuji,kingfisher"
   - Koelsch (RTP0RC7791SEB00010S)
@@ -149,21 +153,3 @@ Boards:
     compatible = "renesas,v3msk", "renesas,r8a77970"
   - Wheat (RTP0RC7792ASKB0000JE)
     compatible = "renesas,wheat", "renesas,r8a7792"
-
-
-Most Renesas ARM SoCs have a Product Register or Boundary Scan ID Register that
-allows to retrieve SoC product and revision information.  If present, a device
-node for this register should be added.
-
-Required properties:
-  - compatible: Must be "renesas,prr" or "renesas,bsid"
-  - reg: Base address and length of the register block.
-
-
-Examples
---------
-
-       prr: chipid@ff000044 {
-               compatible = "renesas,prr";
-               reg = <0 0xff000044 0 4>;
-       };
index 7e49839d41249ca5168b0de1ea02781a2798486d..4b90ba9f31b70b712c285af7ef7f7be180b39b14 100644 (file)
@@ -1,8 +1,12 @@
 I2C for OMAP platforms
 
 Required properties :
-- compatible : Must be "ti,omap2420-i2c", "ti,omap2430-i2c", "ti,omap3-i2c"
-  or "ti,omap4-i2c"
+- compatible : Must be
+       "ti,omap2420-i2c" for OMAP2420 SoCs
+       "ti,omap2430-i2c" for OMAP2430 SoCs
+       "ti,omap3-i2c" for OMAP3 SoCs
+       "ti,omap4-i2c" for OMAP4+ SoCs
+       "ti,am654-i2c", "ti,omap4-i2c" for AM654 SoCs
 - ti,hwmods : Must be "i2c<n>", n being the instance number (1-based)
 - #address-cells = <1>;
 - #size-cells = <0>;
index b3c86f4ac7cdb95ee6674017aecc45fa422294a9..c81993f8d8c391d00e8dd1d1ddcd011131d592e2 100644 (file)
@@ -140,6 +140,10 @@ VADC_GND_REF and VADC_VDD_VADC.
 
 Example:
 
+#include <dt-bindings/iio/qcom,spmi-vadc.h>
+#include <linux/irq.h>
+/* ... */
+
        /* VADC node */
        pmic_vadc: vadc@3100 {
                compatible = "qcom,spmi-vadc";
@@ -151,7 +155,7 @@ Example:
                io-channel-ranges;
 
                /* Channel node */
-               usb_id_nopull {
+               adc-chan@VADC_LR_MUX10_USB_ID {
                        reg = <VADC_LR_MUX10_USB_ID>;
                        qcom,decimation = <512>;
                        qcom,ratiometric;
index 8dd7b3a7de65cde0e6a9907630547c7d6d5a0aaf..f331316183f644ce49536568d918a212b2e6650b 100644 (file)
@@ -2,7 +2,8 @@ Broadcom VCHIQ firmware services
 
 Required properties:
 
-- compatible:  Should be "brcm,bcm2835-vchiq"
+- compatible:  Should be "brcm,bcm2835-vchiq" on BCM2835, otherwise
+               "brcm,bcm2836-vchiq".
 - reg:         Physical base address and length of the doorbell register pair
 - interrupts:  The interrupt number
                  See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt
index a092053f7902fdbba2e2d752b5e725ea83506432..a9da22bda91224e6cccd680bd586555fb3731da7 100644 (file)
@@ -4,12 +4,19 @@ Required properties:
 
 - compatible : should be "amlogic,meson6-timer"
 - reg : Specifies base physical address and size of the registers.
-- interrupts : The interrupt of the first timer
+- interrupts : The four interrupts, one for each timer event
+- clocks : phandles to the pclk (system clock) and XTAL clocks
+- clock-names : must contain "pclk" and "xtal"
 
 Example:
 
 timer@c1109940 {
        compatible = "amlogic,meson6-timer";
        reg = <0xc1109940 0x14>;
-       interrupts = <0 10 1>;
+       interrupts = <GIC_SPI 10 IRQ_TYPE_EDGE_RISING>,
+                    <GIC_SPI 11 IRQ_TYPE_EDGE_RISING>,
+                    <GIC_SPI 6 IRQ_TYPE_EDGE_RISING>,
+                    <GIC_SPI 29 IRQ_TYPE_EDGE_RISING>;
+       clocks = <&xtal>, <&clk81>;
+       clock-names = "xtal", "pclk";
 };
index 9a6e251462e72c2b84d81cb22a1cd12a3efb3a28..b8f02c6635219f57a0473ab1d580ff00bf24b599 100644 (file)
@@ -5,9 +5,13 @@ Required properties:
 - reg : Address and length of the register set of timer controller.
 - interrupts : Should be the interrupt number.
 
+Optional properties:
+- clocks : Should contain a single entry describing the clock input.
+
 Example:
        timer0: timer@d4014000 {
                compatible = "mrvl,mmp-timer";
                reg = <0xd4014000 0x100>;
                interrupts = <13>;
+               clocks = <&coreclk 2>;
        };
index 4b1a2a8fcc16185cd5fae518e0e2fb953becac6f..8c413d8cc2a57d51d830cb86781fd905b807ff35 100644 (file)
@@ -296,6 +296,7 @@ panasonic   Panasonic Corporation
 parade Parade Technologies Inc.
 pericom        Pericom Technology Inc.
 pervasive      Pervasive Displays, Inc.
+phicomm PHICOMM Co., Ltd.
 phytec PHYTEC Messtechnik GmbH
 picochip       Picochip Ltd
 pine64 Pine64
diff --git a/Documentation/i2c/busses/i2c-nvidia-gpu b/Documentation/i2c/busses/i2c-nvidia-gpu
new file mode 100644 (file)
index 0000000..31884d2
--- /dev/null
@@ -0,0 +1,18 @@
+Kernel driver i2c-nvidia-gpu
+
+Datasheet: not publicly available.
+
+Authors:
+       Ajay Gupta <ajayg@nvidia.com>
+
+Description
+-----------
+
+i2c-nvidia-gpu is a driver for I2C controller included in NVIDIA Turing
+and later GPUs and it is used to communicate with Type-C controller on GPUs.
+
+If your 'lspci -v' listing shows something like the following,
+
+01:00.3 Serial bus controller [0c80]: NVIDIA Corporation Device 1ad9 (rev a1)
+
+then this driver should support the I2C controller of your GPU.
index 73aaaa3da4369e39b41bf360b24b820061a15df9..804f9426ed17bdcf0c8fb6dc682ae9254050beb9 100644 (file)
@@ -34,23 +34,24 @@ __________________|____________|__________________|_________|___________________
 ____________________________________________________________|___________________________________________________________
                   |            |                  |         |
  ffff800000000000 | -128    TB | ffff87ffffffffff |    8 TB | ... guard hole, also reserved for hypervisor
- ffff880000000000 | -120    TB | ffffc7ffffffffff |   64 TB | direct mapping of all physical memory (page_offset_base)
- ffffc80000000000 |  -56    TB | ffffc8ffffffffff |    1 TB | ... unused hole
+ ffff880000000000 | -120    TB | ffff887fffffffff |  0.5 TB | LDT remap for PTI
+ ffff888000000000 | -119.5  TB | ffffc87fffffffff |   64 TB | direct mapping of all physical memory (page_offset_base)
+ ffffc88000000000 |  -55.5  TB | ffffc8ffffffffff |  0.5 TB | ... unused hole
  ffffc90000000000 |  -55    TB | ffffe8ffffffffff |   32 TB | vmalloc/ioremap space (vmalloc_base)
  ffffe90000000000 |  -23    TB | ffffe9ffffffffff |    1 TB | ... unused hole
  ffffea0000000000 |  -22    TB | ffffeaffffffffff |    1 TB | virtual memory map (vmemmap_base)
  ffffeb0000000000 |  -21    TB | ffffebffffffffff |    1 TB | ... unused hole
  ffffec0000000000 |  -20    TB | fffffbffffffffff |   16 TB | KASAN shadow memory
- fffffc0000000000 |   -4    TB | fffffdffffffffff |    2 TB | ... unused hole
-                  |            |                  |         | vaddr_end for KASLR
- fffffe0000000000 |   -2    TB | fffffe7fffffffff |  0.5 TB | cpu_entry_area mapping
- fffffe8000000000 |   -1.5  TB | fffffeffffffffff |  0.5 TB | LDT remap for PTI
- ffffff0000000000 |   -1    TB | ffffff7fffffffff |  0.5 TB | %esp fixup stacks
 __________________|____________|__________________|_________|____________________________________________________________
                                                             |
-                                                            | Identical layout to the 47-bit one from here on:
+                                                            | Identical layout to the 56-bit one from here on:
 ____________________________________________________________|____________________________________________________________
                   |            |                  |         |
+ fffffc0000000000 |   -4    TB | fffffdffffffffff |    2 TB | ... unused hole
+                  |            |                  |         | vaddr_end for KASLR
+ fffffe0000000000 |   -2    TB | fffffe7fffffffff |  0.5 TB | cpu_entry_area mapping
+ fffffe8000000000 |   -1.5  TB | fffffeffffffffff |  0.5 TB | ... unused hole
+ ffffff0000000000 |   -1    TB | ffffff7fffffffff |  0.5 TB | %esp fixup stacks
  ffffff8000000000 | -512    GB | ffffffeeffffffff |  444 GB | ... unused hole
  ffffffef00000000 |  -68    GB | fffffffeffffffff |   64 GB | EFI region mapping space
  ffffffff00000000 |   -4    GB | ffffffff7fffffff |    2 GB | ... unused hole
@@ -83,7 +84,7 @@ Notes:
 __________________|____________|__________________|_________|___________________________________________________________
                   |            |                  |         |
  0000800000000000 |  +64    PB | ffff7fffffffffff | ~16K PB | ... huge, still almost 64 bits wide hole of non-canonical
-                  |            |                  |         |     virtual memory addresses up to the -128 TB
+                  |            |                  |         |     virtual memory addresses up to the -64 PB
                   |            |                  |         |     starting offset of kernel mappings.
 __________________|____________|__________________|_________|___________________________________________________________
                                                             |
@@ -91,23 +92,24 @@ __________________|____________|__________________|_________|___________________
 ____________________________________________________________|___________________________________________________________
                   |            |                  |         |
  ff00000000000000 |  -64    PB | ff0fffffffffffff |    4 PB | ... guard hole, also reserved for hypervisor
- ff10000000000000 |  -60    PB | ff8fffffffffffff |   32 PB | direct mapping of all physical memory (page_offset_base)
- ff90000000000000 |  -28    PB | ff9fffffffffffff |    4 PB | LDT remap for PTI
+ ff10000000000000 |  -60    PB | ff10ffffffffffff | 0.25 PB | LDT remap for PTI
+ ff11000000000000 |  -59.75 PB | ff90ffffffffffff |   32 PB | direct mapping of all physical memory (page_offset_base)
+ ff91000000000000 |  -27.75 PB | ff9fffffffffffff | 3.75 PB | ... unused hole
  ffa0000000000000 |  -24    PB | ffd1ffffffffffff | 12.5 PB | vmalloc/ioremap space (vmalloc_base)
  ffd2000000000000 |  -11.5  PB | ffd3ffffffffffff |  0.5 PB | ... unused hole
  ffd4000000000000 |  -11    PB | ffd5ffffffffffff |  0.5 PB | virtual memory map (vmemmap_base)
  ffd6000000000000 |  -10.5  PB | ffdeffffffffffff | 2.25 PB | ... unused hole
  ffdf000000000000 |   -8.25 PB | fffffdffffffffff |   ~8 PB | KASAN shadow memory
- fffffc0000000000 |   -4    TB | fffffdffffffffff |    2 TB | ... unused hole
-                  |            |                  |         | vaddr_end for KASLR
- fffffe0000000000 |   -2    TB | fffffe7fffffffff |  0.5 TB | cpu_entry_area mapping
- fffffe8000000000 |   -1.5  TB | fffffeffffffffff |  0.5 TB | ... unused hole
- ffffff0000000000 |   -1    TB | ffffff7fffffffff |  0.5 TB | %esp fixup stacks
 __________________|____________|__________________|_________|____________________________________________________________
                                                             |
                                                             | Identical layout to the 47-bit one from here on:
 ____________________________________________________________|____________________________________________________________
                   |            |                  |         |
+ fffffc0000000000 |   -4    TB | fffffdffffffffff |    2 TB | ... unused hole
+                  |            |                  |         | vaddr_end for KASLR
+ fffffe0000000000 |   -2    TB | fffffe7fffffffff |  0.5 TB | cpu_entry_area mapping
+ fffffe8000000000 |   -1.5  TB | fffffeffffffffff |  0.5 TB | ... unused hole
+ ffffff0000000000 |   -1    TB | ffffff7fffffffff |  0.5 TB | %esp fixup stacks
  ffffff8000000000 | -512    GB | ffffffeeffffffff |  444 GB | ... unused hole
  ffffffef00000000 |  -68    GB | fffffffeffffffff |   64 GB | EFI region mapping space
  ffffffff00000000 |   -4    GB | ffffffff7fffffff |    2 GB | ... unused hole
index 97b7adbceda4828ab217301a305a3b20892d0603..68aed077f7b62ed0e70315bde602bfbec50a78bf 100644 (file)
@@ -25,7 +25,7 @@ Offset        Proto   Name            Meaning
 0C8/004        ALL     ext_cmd_line_ptr  cmd_line_ptr high 32bits
 140/080        ALL     edid_info       Video mode setup (struct edid_info)
 1C0/020        ALL     efi_info        EFI 32 information (struct efi_info)
-1E0/004        ALL     alk_mem_k       Alternative mem check, in KB
+1E0/004        ALL     alt_mem_k       Alternative mem check, in KB
 1E4/004        ALL     scratch         Scratch field for the kernel setup code
 1E8/001        ALL     e820_entries    Number of entries in e820_table (below)
 1E9/001        ALL     eddbuf_entries  Number of entries in eddbuf (below)
index f4855974f325063c1e5fea88d9d755ce75ee3b66..e3dfefb85b9420897c41d18a62cefb6d42cfbfdb 100644 (file)
@@ -6607,9 +6607,9 @@ F:        arch/*/include/asm/suspend*.h
 
 HID CORE LAYER
 M:     Jiri Kosina <jikos@kernel.org>
-R:     Benjamin Tissoires <benjamin.tissoires@redhat.com>
+M:     Benjamin Tissoires <benjamin.tissoires@redhat.com>
 L:     linux-input@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
 S:     Maintained
 F:     drivers/hid/
 F:     include/linux/hid*
@@ -6861,6 +6861,13 @@ L:       linux-acpi@vger.kernel.org
 S:     Maintained
 F:     drivers/i2c/i2c-core-acpi.c
 
+I2C CONTROLLER DRIVER FOR NVIDIA GPU
+M:     Ajay Gupta <ajayg@nvidia.com>
+L:     linux-i2c@vger.kernel.org
+S:     Maintained
+F:     Documentation/i2c/busses/i2c-nvidia-gpu
+F:     drivers/i2c/busses/i2c-nvidia-gpu.c
+
 I2C MUXES
 M:     Peter Rosin <peda@axentia.se>
 L:     linux-i2c@vger.kernel.org
@@ -8367,7 +8374,7 @@ F:        drivers/media/dvb-frontends/lgdt3305.*
 LIBATA PATA ARASAN COMPACT FLASH CONTROLLER
 M:     Viresh Kumar <vireshk@kernel.org>
 L:     linux-ide@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 S:     Maintained
 F:     include/linux/pata_arasan_cf_data.h
 F:     drivers/ata/pata_arasan_cf.c
@@ -8384,7 +8391,7 @@ F:        drivers/ata/ata_generic.c
 LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS
 M:     Linus Walleij <linus.walleij@linaro.org>
 L:     linux-ide@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 S:     Maintained
 F:     drivers/ata/pata_ftide010.c
 F:     drivers/ata/sata_gemini.c
@@ -8403,7 +8410,7 @@ F:        include/linux/ahci_platform.h
 LIBATA SATA PROMISE TX2/TX4 CONTROLLER DRIVER
 M:     Mikael Pettersson <mikpelinux@gmail.com>
 L:     linux-ide@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 S:     Maintained
 F:     drivers/ata/sata_promise.*
 
@@ -10784,6 +10791,14 @@ L:     linux-omap@vger.kernel.org
 S:     Maintained
 F:     arch/arm/mach-omap2/omap_hwmod.*
 
+OMAP I2C DRIVER
+M:     Vignesh R <vigneshr@ti.com>
+L:     linux-omap@vger.kernel.org
+L:     linux-i2c@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/i2c/i2c-omap.txt
+F:     drivers/i2c/busses/i2c-omap.c
+
 OMAP IMAGING SUBSYSTEM (OMAP3 ISP and OMAP4 ISS)
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
@@ -12359,6 +12374,13 @@ L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
 F:     drivers/iommu/qcom_iommu.c
 
+QUALCOMM TSENS THERMAL DRIVER
+M:     Amit Kucheria <amit.kucheria@linaro.org>
+L:     linux-pm@vger.kernel.org
+L:     linux-arm-msm@vger.kernel.org
+S:     Maintained
+F:     drivers/thermal/qcom/
+
 QUALCOMM VENUS VIDEO ACCELERATOR DRIVER
 M:     Stanimir Varbanov <stanimir.varbanov@linaro.org>
 L:     linux-media@vger.kernel.org
@@ -15436,9 +15458,9 @@ F:      include/linux/usb/gadget*
 
 USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)
 M:     Jiri Kosina <jikos@kernel.org>
-R:     Benjamin Tissoires <benjamin.tissoires@redhat.com>
+M:     Benjamin Tissoires <benjamin.tissoires@redhat.com>
 L:     linux-usb@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
 S:     Maintained
 F:     Documentation/hid/hiddev.txt
 F:     drivers/hid/usbhid/
index 9fce8b91c15f6055f534eb18432e706a5ac3b09c..2f36db89789534f69abae6f23bb522f4300bc517 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 VERSION = 4
 PATCHLEVEL = 20
 SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
 NAME = "People's Front"
 
 # *DOCUMENTATION*
index 6a8c53dec57e6e3aa22a5be371b922ebb1bd154d..b7c77bb1bfd20368a8ff95a93d5493353e58023a 100644 (file)
 })
 
 #define user_termios_to_kernel_termios(k, u) \
-       copy_from_user(k, u, sizeof(struct termios))
+       copy_from_user(k, u, sizeof(struct termios2))
 
 #define kernel_termios_to_user_termios(u, k) \
+       copy_to_user(u, k, sizeof(struct termios2))
+
+#define user_termios_to_kernel_termios_1(k, u) \
+       copy_from_user(k, u, sizeof(struct termios))
+
+#define kernel_termios_to_user_termios_1(u, k) \
        copy_to_user(u, k, sizeof(struct termios))
 
 #endif /* _ALPHA_TERMIOS_H */
index 1e9121c9b3c74c16d129ce6fac97f614080dca94..971311605288faea94b19d23d0b346361a11a6a9 100644 (file)
 #define TCXONC         _IO('t', 30)
 #define TCFLSH         _IO('t', 31)
 
+#define TCGETS2                _IOR('T', 42, struct termios2)
+#define TCSETS2                _IOW('T', 43, struct termios2)
+#define TCSETSW2       _IOW('T', 44, struct termios2)
+#define TCSETSF2       _IOW('T', 45, struct termios2)
+
 #define TIOCSWINSZ     _IOW('t', 103, struct winsize)
 #define TIOCGWINSZ     _IOR('t', 104, struct winsize)
 #define        TIOCSTART       _IO('t', 110)           /* start output, like ^Q */
index de6c8360fbe3657e3ddf7cd6bb648a3d8b0fdb71..4575ba34a0eaeecb9b17cb9f3b6b18a698bafdfb 100644 (file)
@@ -26,6 +26,19 @@ struct termios {
        speed_t c_ospeed;               /* output speed */
 };
 
+/* Alpha has identical termios and termios2 */
+
+struct termios2 {
+       tcflag_t c_iflag;               /* input mode flags */
+       tcflag_t c_oflag;               /* output mode flags */
+       tcflag_t c_cflag;               /* control mode flags */
+       tcflag_t c_lflag;               /* local mode flags */
+       cc_t c_cc[NCCS];                /* control characters */
+       cc_t c_line;                    /* line discipline (== c_cc[19]) */
+       speed_t c_ispeed;               /* input speed */
+       speed_t c_ospeed;               /* output speed */
+};
+
 /* Alpha has matching termios and ktermios */
 
 struct ktermios {
@@ -152,6 +165,7 @@ struct ktermios {
 #define B3000000  00034
 #define B3500000  00035
 #define B4000000  00036
+#define BOTHER    00037
 
 #define CSIZE  00001400
 #define   CS5  00000000
@@ -169,6 +183,9 @@ struct ktermios {
 #define CMSPAR   010000000000          /* mark or space (stick) parity */
 #define CRTSCTS          020000000000          /* flow control */
 
+#define CIBAUD 07600000
+#define IBSHIFT        16
+
 /* c_lflag bits */
 #define ISIG   0x00000080
 #define ICANON 0x00000100
index b0e966d625b929da7f631fd5db049f37e6206400..303aec88ee0b9e1107120bafcd6ef23fd85a7458 100644 (file)
@@ -89,6 +89,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
        bcm4708-asus-rt-ac68u.dtb \
        bcm4708-buffalo-wzr-1750dhp.dtb \
        bcm4708-linksys-ea6300-v1.dtb \
+       bcm4708-linksys-ea6500-v2.dtb \
        bcm4708-luxul-xap-1510.dtb \
        bcm4708-luxul-xwc-1000.dtb \
        bcm4708-netgear-r6250.dtb \
@@ -778,12 +779,18 @@ dtb-$(CONFIG_ARCH_ACTIONS) += \
        owl-s500-sparky.dtb
 dtb-$(CONFIG_ARCH_PRIMA2) += \
        prima2-evb.dtb
+dtb-$(CONFIG_ARCH_PXA) += \
+       pxa300-raumfeld-connector.dtb \
+       pxa300-raumfeld-controller.dtb \
+       pxa300-raumfeld-speaker-l.dtb \
+       pxa300-raumfeld-speaker-m.dtb \
+       pxa300-raumfeld-speaker-one.dtb \
+       pxa300-raumfeld-speaker-s.dtb
 dtb-$(CONFIG_ARCH_OXNAS) += \
        ox810se-wd-mbwe.dtb \
        ox820-cloudengines-pogoplug-series-3.dtb
 dtb-$(CONFIG_ARCH_QCOM) += \
        qcom-apq8060-dragonboard.dtb \
-       qcom-apq8064-arrow-sd-600eval.dtb \
        qcom-apq8064-cm-qs600.dtb \
        qcom-apq8064-ifc6410.dtb \
        qcom-apq8064-sony-xperia-yuga.dtb \
@@ -829,6 +836,8 @@ dtb-$(CONFIG_ARCH_RENESAS) += \
        r8a7743-iwg20d-q7.dtb \
        r8a7743-iwg20d-q7-dbcm-ca.dtb \
        r8a7743-sk-rzg1m.dtb \
+       r8a7744-iwg20d-q7.dtb \
+       r8a7744-iwg20d-q7-dbcm-ca.dtb \
        r8a7745-iwg22d-sodimm.dtb \
        r8a7745-iwg22d-sodimm-dbhd-ca.dtb \
        r8a7745-sk-rzg1e.dtb \
@@ -1212,6 +1221,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
        aspeed-ast2500-evb.dtb \
        aspeed-bmc-arm-centriq2400-rep.dtb \
        aspeed-bmc-arm-stardragon4800-rep2.dtb \
+       aspeed-bmc-facebook-cmm.dtb \
        aspeed-bmc-facebook-tiogapass.dtb \
        aspeed-bmc-intel-s2600wf.dtb \
        aspeed-bmc-opp-lanyang.dtb \
index d4d33cd7adad73c793c382c9b15026745a9b355b..07f593955761264588f5cc5764053357c61cd503 100644 (file)
                display0 = &lcd0;
        };
 
+       chosen {
+               stdout-path = &uart3;
+       };
+
        memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
index 601bf4daaeb76dd2afaa41186cc4fd1e15b03a52..f4a20cade80858a72d1327e5c671121f8c7d5bec 100644 (file)
                debounce-delay-ms = <5>;
                col-scan-delay-us = <2>;
 
-               row-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH /* Bank3, pin21 */
+               pinctrl-names = "default", "sleep";
+               pinctrl-0 = <&matrix_keypad_default>;
+               pinctrl-1 = <&matrix_keypad_sleep>;
+
+               linux,wakeup;
+
+               row-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH /* Bank0, pin3 */
                                &gpio4 3 GPIO_ACTIVE_HIGH /* Bank4, pin3 */
                                &gpio4 2 GPIO_ACTIVE_HIGH>; /* Bank4, pin2 */
 
        beeper: beeper {
                compatible = "gpio-beeper";
                pinctrl-names = "default";
-               pinctrl-0 = <&beeper_pins>;
+               pinctrl-0 = <&beeper_pins_default>;
+               pinctrl-1 = <&beeper_pins_sleep>;
                gpios = <&gpio4 12 GPIO_ACTIVE_HIGH>;
        };
 };
 
 &am43xx_pinmux {
        pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&wlan_pins_default>;
+       pinctrl-0 = <&wlan_pins_default &ddr3_vtt_toggle_default &unused_pins &debugss_pins>;
        pinctrl-1 = <&wlan_pins_sleep>;
 
+       ddr3_vtt_toggle_default: ddr_vtt_toggle_default {
+               pinctrl-single,pins = <
+                       0x25C (DS0_PULL_UP_DOWN_EN | PIN_OUTPUT_PULLUP | DS0_FORCE_OFF_MODE | MUX_MODE7) /* spi0_cs0.gpio5_7 */
+               >;
+       };
+
        i2c0_pins: i2c0_pins {
                pinctrl-single,pins = <
                        AM4372_IOPAD(0x988, PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)  /* i2c0_sda.i2c0_sda */
                >;
        };
 
+       beeper_pins_default: beeper_pins_default {
+               pinctrl-single,pins = <
+                       AM4372_IOPAD(0x9e0, PIN_OUTPUT_PULLUP | MUX_MODE7)      /* cam1_field.gpio4_12 */
+               >;
+       };
+
+       beeper_pins_sleep: beeper_pins_sleep {
+               pinctrl-single,pins = <
+                       AM4372_IOPAD(0x9e0, PIN_INPUT_PULLDOWN | MUX_MODE7)     /* cam1_field.gpio4_12 */
+               >;
+       };
+
+       unused_pins: unused_pins {
+               pinctrl-single,pins = <
+                       AM4372_IOPAD(0x854, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0x858, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0x860, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0x864, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0x868, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0x86c, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0x950, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0x990, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0x994, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0x998, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0x99c, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0x9a0, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xa3c, PIN_INPUT | PULL_DISABLE | MUX_MODE7)
+                       AM4372_IOPAD(0xa40, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xa44, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xa48, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xa4c, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xa50, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xa54, PIN_INPUT | PULL_DISABLE | MUX_MODE7)
+                       AM4372_IOPAD(0xa58, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xa60, PIN_INPUT | PULL_DISABLE | MUX_MODE7)
+                       AM4372_IOPAD(0xa68, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xa70, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xa78, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xa7c, PIN_INPUT | PULL_DISABLE)
+                       AM4372_IOPAD(0xac8, PIN_INPUT_PULLDOWN)
+                       AM4372_IOPAD(0xad4, PIN_INPUT_PULLDOWN)
+                       AM4372_IOPAD(0xad8, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xadc, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xae0, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xae4, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xae8, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xaec, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xaf0, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xaf4, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xaf8, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xafc, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xb00, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xb04, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xb08, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xb0c, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xb10, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xb14, PIN_INPUT_PULLDOWN | MUX_MODE7)
+                       AM4372_IOPAD(0xb18, PIN_INPUT_PULLDOWN | MUX_MODE7)
+               >;
+       };
+
+       debugss_pins: pinmux_debugss_pins {
+               pinctrl-single,pins = <
+                       AM4372_IOPAD(0xa90, PIN_INPUT_PULLDOWN)
+                       AM4372_IOPAD(0xa94, PIN_INPUT_PULLDOWN)
+                       AM4372_IOPAD(0xa98, PIN_INPUT_PULLDOWN)
+                       AM4372_IOPAD(0xa9c, PIN_INPUT_PULLDOWN)
+                       AM4372_IOPAD(0xaa0, PIN_INPUT_PULLDOWN)
+                       AM4372_IOPAD(0xaa4, PIN_INPUT_PULLDOWN)
+                       AM4372_IOPAD(0xaa8, PIN_INPUT_PULLDOWN)
+               >;
+       };
+
        uart0_pins_default: uart0_pins_default {
                pinctrl-single,pins = <
-                       AM4372_IOPAD(0x968, PIN_INPUT | MUX_MODE0)              /* uart0_ctsn.uart0_ctsn */
-                       AM4372_IOPAD(0x96C, PIN_OUTPUT_PULLDOWN | MUX_MODE0)    /* uart0_rtsn.uart0_rtsn */
-                       AM4372_IOPAD(0x970, PIN_INPUT_PULLUP | MUX_MODE0)       /* uart0_rxd.uart0_rxd */
-                       AM4372_IOPAD(0x974, PIN_OUTPUT_PULLDOWN | MUX_MODE0)    /* uart0_txd.uart0_txd */
+                       AM4372_IOPAD(0x968, DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE0) /* uart0_ctsn.uart0_ctsn */
+                       AM4372_IOPAD(0x96C, DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE0) /* uart0_rtsn.uart0_rtsn */
+                       AM4372_IOPAD(0x970, PIN_INPUT_PULLUP | SLEWCTRL_FAST | DS0_PULL_UP_DOWN_EN | MUX_MODE0) /* uart0_rxd.uart0_rxd */
+                       AM4372_IOPAD(0x974, PIN_INPUT | PULL_DISABLE | SLEWCTRL_FAST | DS0_PULL_UP_DOWN_EN | MUX_MODE0) /* uart0_txd.uart0_txd */
                >;
        };
 
-       beeper_pins: beeper_pins {
+       uart0_pins_sleep: uart0_pins_sleep {
                pinctrl-single,pins = <
-                       AM4372_IOPAD(0x9e0, PIN_OUTPUT_PULLUP | MUX_MODE7)      /* cam1_field.gpio4_12 */
+                       AM4372_IOPAD(0x968, DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7) /* uart0_ctsn.uart0_ctsn */
+                       AM4372_IOPAD(0x96C, DS0_PULL_UP_DOWN_EN | INPUT_EN | MUX_MODE7) /* uart0_rtsn.uart0_rtsn */
+                       AM4372_IOPAD(0x970, PIN_INPUT_PULLUP | SLEWCTRL_FAST | DS0_PULL_UP_DOWN_EN | MUX_MODE0) /* uart0_rxd.uart0_rxd */
+                       AM4372_IOPAD(0x974, PIN_INPUT_PULLDOWN | SLEWCTRL_FAST | DS0_PULL_UP_DOWN_EN | MUX_MODE0) /* uart0_txd.uart0_txd */
+               >;
+       };
+
+       matrix_keypad_default: matrix_keypad_default {
+               pinctrl-single,pins = <
+                       AM4372_IOPAD(0x9a4, PIN_OUTPUT | MUX_MODE7)
+                       AM4372_IOPAD(0x9a8, PIN_OUTPUT | MUX_MODE7)
+                       AM4372_IOPAD(0x9ac, PIN_INPUT | PULL_DISABLE | MUX_MODE9)
+                       AM4372_IOPAD(0x954, PIN_INPUT_PULLDOWN | MUX_MODE0)
                >;
        };
 
+       matrix_keypad_sleep: matrix_keypad_sleep {
+               pinctrl-single,pins = <
+                       AM4372_IOPAD(0x9a4, PULL_UP | MUX_MODE7)
+                       AM4372_IOPAD(0x9a8, PULL_UP | MUX_MODE7)
+                       AM4372_IOPAD(0x9ac, PIN_INPUT | PULL_DISABLE | MUX_MODE9)
+                       AM4372_IOPAD(0x954, PIN_INPUT_PULLDOWN | MUX_MODE0)
+               >;
+       };
 };
 
 &uart0 {
        status = "okay";
-       pinctrl-names = "default";
+       pinctrl-names = "default", "sleep";
        pinctrl-0 = <&uart0_pins_default>;
+       pinctrl-1 = <&uart0_pins_sleep>;
 };
 
 &i2c0 {
index a5676697ff3b7dee101d3f56e92379bc6c6b3e64..916a97734f84cc7b72d7087d09e429020c8c957c 100644 (file)
@@ -44,7 +44,7 @@
        };
 
        /* The voltage to the MMC card is hardwired at 3.3V */
-       vmmc: fixedregulator@0 {
+       vmmc: regulator-vmmc {
                compatible = "regulator-fixed";
                regulator-name = "vmmc";
                regulator-min-microvolt = <3300000>;
@@ -52,7 +52,7 @@
                regulator-boot-on;
         };
 
-       veth: fixedregulator@0 {
+       veth: regulator-veth {
                compatible = "regulator-fixed";
                regulator-name = "veth";
                regulator-min-microvolt = <3300000>;
                };
        };
 };
-
index df1227613d48e3430eadda82220fc58dcc1f7936..c2ece0b91885e19a582fd38c8aac6b3b7ef6c985 100644 (file)
@@ -13,7 +13,7 @@
                bootargs = "console=ttyS4,115200 earlyprintk";
        };
 
-       memory {
+       memory@80000000 {
                reg = <0x80000000 0x40000000>;
        };
 
diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts
new file mode 100644 (file)
index 0000000..9f194b5
--- /dev/null
@@ -0,0 +1,368 @@
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright (c) 2018 Facebook Inc.
+/dts-v1/;
+
+#include "aspeed-g5.dtsi"
+
+/ {
+       model = "Facebook Backpack CMM BMC";
+       compatible = "facebook,cmm-bmc", "aspeed,ast2500";
+
+       aliases {
+               /*
+                * Override the default uart aliases to avoid breaking
+                * the legacy applications.
+                */
+               serial0 = &uart5;
+               serial1 = &uart1;
+               serial2 = &uart3;
+               serial3 = &uart4;
+
+               /*
+                * Hardcode the bus number of i2c switches' channels to
+                * avoid breaking the legacy applications.
+                */
+               i2c16 = &imux16;
+               i2c17 = &imux17;
+               i2c18 = &imux18;
+               i2c19 = &imux19;
+               i2c20 = &imux20;
+               i2c21 = &imux21;
+               i2c22 = &imux22;
+               i2c23 = &imux23;
+               i2c24 = &imux24;
+               i2c25 = &imux25;
+               i2c26 = &imux26;
+               i2c27 = &imux27;
+               i2c28 = &imux28;
+               i2c29 = &imux29;
+               i2c30 = &imux30;
+               i2c31 = &imux31;
+               i2c32 = &imux32;
+               i2c33 = &imux33;
+               i2c34 = &imux34;
+               i2c35 = &imux35;
+               i2c36 = &imux36;
+               i2c37 = &imux37;
+               i2c38 = &imux38;
+               i2c39 = &imux39;
+       };
+
+       chosen {
+               stdout-path = &uart1;
+               bootargs = "console=ttyS1,9600n8 root=/dev/ram rw earlyprintk";
+       };
+
+       memory@80000000 {
+               reg = <0x80000000 0x20000000>;
+       };
+};
+
+&pinctrl {
+       aspeed,external-nodes = <&gfx &lhc>;
+};
+
+/*
+ * Update reset type to "system" (full chip) to fix warm reboot hang issue
+ * when reset type is set to default ("soc", gated by reset mask registers).
+ */
+&wdt1 {
+       status = "okay";
+       aspeed,reset-type = "system";
+};
+
+/*
+ * wdt2 is not used by Backpack CMM.
+ */
+&wdt2 {
+       status = "disabled";
+};
+
+&fmc {
+       status = "okay";
+       flash@0 {
+               status = "okay";
+               m25p,fast-read;
+               label = "bmc";
+#include "facebook-bmc-flash-layout.dtsi"
+       };
+};
+
+&uart1 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_txd1_default
+                    &pinctrl_rxd1_default
+                    &pinctrl_ncts1_default
+                    &pinctrl_ndcd1_default
+                    &pinctrl_ndsr1_default
+                    &pinctrl_ndtr1_default
+                    &pinctrl_nrts1_default>;
+};
+
+&uart3 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_txd3_default
+                    &pinctrl_rxd3_default
+                    &pinctrl_ncts3_default
+                    &pinctrl_ndcd3_default
+                    &pinctrl_nri3_default>;
+};
+
+&uart4 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_txd4_default
+                    &pinctrl_rxd4_default>;
+};
+
+&uart5 {
+       status = "okay";
+};
+
+&mac1 {
+       status = "okay";
+       no-hw-checksum;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;
+};
+
+/*
+ * I2C bus reserved for communication with COM-E.
+ */
+&i2c0 {
+       status = "okay";
+};
+
+/*
+ * I2C bus to Line Cards and Fabric Cards.
+ */
+&i2c1 {
+       status = "okay";
+
+       i2c-switch@77 {
+               compatible = "nxp,pca9548";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               reg = <0x77>;
+
+               imux16: i2c@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0>;
+               };
+
+               imux17: i2c@1 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <1>;
+               };
+
+               imux18: i2c@2 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <2>;
+               };
+
+               imux19: i2c@3 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <3>;
+               };
+
+               imux20: i2c@4 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <4>;
+               };
+
+               imux21: i2c@5 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <5>;
+               };
+
+               imux22: i2c@6 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <6>;
+               };
+
+               imux23: i2c@7 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <7>;
+               };
+       };
+};
+
+/*
+ * I2C bus to Power Distribution Board.
+ */
+&i2c2 {
+       status = "okay";
+
+       i2c-switch@71 {
+               compatible = "nxp,pca9548";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               reg = <0x71>;
+
+               imux24: i2c@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0>;
+               };
+
+               imux25: i2c@1 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <1>;
+               };
+
+               imux26: i2c@2 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <2>;
+               };
+
+               imux27: i2c@3 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <3>;
+               };
+
+               imux28: i2c@4 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <4>;
+               };
+
+               imux29: i2c@5 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <5>;
+               };
+
+               imux30: i2c@6 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <6>;
+               };
+
+               imux31: i2c@7 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <7>;
+               };
+       };
+};
+
+/*
+ * I2c bus connected with temperature sensors on CMM.
+ */
+&i2c3 {
+       status = "okay";
+};
+
+/*
+ * I2C bus reserved for communication with COM-E.
+ */
+&i2c4 {
+       status = "okay";
+};
+
+/*
+ * I2c bus connected with ADM1278.
+ */
+&i2c5 {
+       status = "okay";
+};
+
+/*
+ * I2c bus connected with I/O Expander.
+ */
+&i2c6 {
+       status = "okay";
+};
+
+/*
+ * I2c bus connected with I/O Expander and EPROMs.
+ */
+&i2c7 {
+       status = "okay";
+};
+
+/*
+ * I2C bus to Fan Control Board.
+ */
+&i2c8 {
+       status = "okay";
+
+       i2c-switch@77 {
+               compatible = "nxp,pca9548";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               reg = <0x77>;
+
+               imux32: i2c@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0>;
+               };
+
+               imux33: i2c@1 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <1>;
+               };
+
+               imux34: i2c@2 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <2>;
+               };
+
+               imux35: i2c@3 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <3>;
+               };
+
+               imux36: i2c@4 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <4>;
+               };
+
+               imux37: i2c@5 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <5>;
+               };
+
+               imux38: i2c@6 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <6>;
+               };
+
+               imux39: i2c@7 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <7>;
+               };
+       };
+};
+
+/*
+ * I2C bus to CMM CPLD.
+ */
+&i2c13 {
+       status = "okay";
+};
+
+&adc {
+       status = "okay";
+};
index 7a291de02543d0bf1d3d712fbbb0fd903de87558..22dade6393d063c275fd79955c93aa61647be846 100644 (file)
@@ -13,7 +13,7 @@
                bootargs = "earlyprintk";
        };
 
-       memory {
+       memory@80000000 {
                reg = <0x80000000 0x20000000>;
        };
 
index d598b63913625a34e36b0ba0ef1cf5266441e1c9..024e52a6cd0f8f8e781c7f62a7811cecf8e5d7b6 100644 (file)
@@ -14,7 +14,7 @@
                bootargs = "console=ttyS4,115200 earlyprintk";
        };
 
-       memory {
+       memory@80000000 {
                reg = <0x80000000 0x40000000>;
        };
 
 &adc {
        status = "okay";
 };
-
index c7084a819dc69cc1a87e800fb3a4546c21fb95f1..9aa1d446745343f1c637d108ebf0c963367ce0cf 100644 (file)
                        no-map;
                        reg = <0x5f000000 0x01000000>; /* 16M */
                };
+
+               coldfire_memory: codefire_memory@5ee00000 {
+                       reg = <0x5ee00000 0x00200000>;
+                       no-map;
+               };
+
+               flash_memory: region@98000000 {
+                       no-map;
+                       reg = <0x98000000 0x01000000>; /* 16MB */
+               };
        };
 
        leds {
                };
        };
 
+       fsi: gpio-fsi {
+               compatible = "aspeed,ast2400-cf-fsi-master", "fsi-master";
+               #address-cells = <2>;
+               #size-cells = <0>;
+
+               memory-region = <&coldfire_memory>;
+               aspeed,sram = <&sram>;
+               aspeed,cvic = <&cvic>;
+
+               clock-gpios = <&gpio ASPEED_GPIO(A, 4) GPIO_ACTIVE_HIGH>;
+               data-gpios = <&gpio ASPEED_GPIO(A, 5) GPIO_ACTIVE_HIGH>;
+               mux-gpios = <&gpio ASPEED_GPIO(A, 6) GPIO_ACTIVE_HIGH>;
+               enable-gpios = <&gpio ASPEED_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
+               trans-gpios = <&gpio ASPEED_GPIO(H, 6) GPIO_ACTIVE_HIGH>;
+       };
+
        gpio-keys {
                compatible = "gpio-keys";
 
        status = "okay";
 };
 
+&lpc_ctrl {
+       status = "okay";
+       memory-region = <&flash_memory>;
+       flash = <&spi>;
+};
+
 &gpio {
        pin_func_mode0 {
                gpio-hog;
                line-name = "SYS_PWROK_BMC";
        };
 
-       pin_gpio_h6 {
-               gpio-hog;
-               gpios = <ASPEED_GPIO(H, 6) GPIO_ACTIVE_HIGH>;
-               output-high;
-               line-name = "SCM1_FSI0_DATA_EN";
-       };
-
        pin_gpio_h7 {
                gpio-hog;
                gpios = <ASPEED_GPIO(H, 7) GPIO_ACTIVE_HIGH>;
index 7d28c03a9e0bccf7352a61d7e5016727c936b8de..76fe994f2ba4075b70972df15d5fd3eed364b9b7 100644 (file)
                        no-map;
                        reg = <0x98000000 0x04000000>; /* 64M */
                };
+
+               coldfire_memory: codefire_memory@9ef00000 {
+                       reg = <0x9ef00000 0x00100000>;
+                       no-map;
+               };
        };
 
        leds {
        };
 
        fsi: gpio-fsi {
-               compatible = "fsi-master-gpio", "fsi-master";
+               compatible = "aspeed,ast2500-cf-fsi-master", "fsi-master";
                #address-cells = <2>;
                #size-cells = <0>;
                no-gpio-delays;
 
+               memory-region = <&coldfire_memory>;
+               aspeed,sram = <&sram>;
+               aspeed,cvic = <&cvic>;
+
                clock-gpios = <&gpio ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>;
                data-gpios = <&gpio ASPEED_GPIO(AA, 2) GPIO_ACTIVE_HIGH>;
                mux-gpios = <&gpio ASPEED_GPIO(A, 6) GPIO_ACTIVE_HIGH>;
                        linux,code = <ASPEED_GPIO(Q, 7)>;
                };
        };
+
+       iio-hwmon-battery {
+               compatible = "iio-hwmon";
+               io-channels = <&adc 12>;
+       };
 };
 
 &fmc {
 &ibt {
        status = "okay";
 };
+
+&vhub {
+       status = "okay";
+};
+
+&adc {
+       status = "okay";
+};
index 656036106001ae9adddab3d710fd54d934c60e77..ad54117c075e994e00f17fcbcbe05e0785e359cd 100644 (file)
                };
        };
 
+       iio-hwmon-battery {
+               compatible = "iio-hwmon";
+               io-channels = <&adc 12>;
+       };
+
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
 &ibt {
        status = "okay";
 };
+
+&adc {
+       status = "okay";
+};
index 43ed13963d35424e05bc1d44d12b6f9dce44e8db..33d704541de6298daeede6ec9a6d20f8d4735af2 100644 (file)
@@ -17,7 +17,7 @@
                bootargs = "console=ttyS4,115200 earlyprintk";
        };
 
-       memory {
+       memory@80000000 {
                reg = <0x80000000 0x20000000>;
        };
 
index 2fd111d9d59c56e087fc1af317806a2d1f438435..0d2538b4613952c893ec0c0b213c9c7f21b02fe9 100644 (file)
        model = "Broadcom Northstar Plus SoC";
        interrupt-parent = <&gic>;
 
+       aliases {
+               serial0 = &uart0;
+               serial1 = &uart1;
+               ethernet0 = &amac0;
+               ethernet1 = &amac1;
+               ethernet2 = &amac2;
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
index b7f79f1c431ae4c0a946abb15a67351a51ede9d0..644d907bafbb6932559b3acb73caf04f3733fe3b 100644 (file)
@@ -1,12 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2017 Stefan Wahren <stefan.wahren@i2se.com>
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
  */
 
 /dts-v1/;
index 70362405c59522fb7835a7b4b13ebb43592edfc4..00323ba8f7de5cb2aab2d0d83218790029630531 100644 (file)
@@ -1,12 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2016 Stefan Wahren <stefan.wahren@i2se.com>
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
  */
 
 /dts-v1/;
index cb2d6d78a7fbf5d9a1ef3f70563fcb94f2ce8bef..29f970f864dc1d42a7fb9204cae7e649c1c68560 100644 (file)
@@ -30,9 +30,9 @@
                        #power-domain-cells = <1>;
                };
 
-               mailbox@7e00b840 {
+               vchiq: mailbox@7e00b840 {
                        compatible = "brcm,bcm2835-vchiq";
-                       reg = <0x7e00b840 0xf>;
+                       reg = <0x7e00b840 0x3c>;
                        interrupts = <0 2>;
                };
        };
index 2fef70a099535dfceb746b64384ec5b41ff0c1ab..ac4408b34b58ef0e7c7be3063fb6dc87c150b5cd 100644 (file)
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 #include "bcm2836.dtsi"
-#include "bcm2835-rpi.dtsi"
+#include "bcm2836-rpi.dtsi"
 #include "bcm283x-rpi-smsc9514.dtsi"
 #include "bcm283x-rpi-usb-host.dtsi"
 
diff --git a/arch/arm/boot/dts/bcm2836-rpi.dtsi b/arch/arm/boot/dts/bcm2836-rpi.dtsi
new file mode 100644 (file)
index 0000000..c4c858b
--- /dev/null
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "bcm2835-rpi.dtsi"
+
+&vchiq {
+       compatible = "brcm,bcm2836-vchiq", "brcm,bcm2835-vchiq";
+};
index 4adb85e66be3f975894cb712211478439709f274..eca36e3ae6c20606beb60e4acfaa1e4871b157c7 100644 (file)
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 #include "bcm2837.dtsi"
-#include "bcm2835-rpi.dtsi"
+#include "bcm2836-rpi.dtsi"
 #include "bcm283x-rpi-lan7515.dtsi"
 #include "bcm283x-rpi-usb-host.dtsi"
 
index c318bcbc6ba7e327bcf164fd543cd47c04c52d2c..a0ba0f68d22b0905ed67bdc8834e894b678171d4 100644 (file)
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 #include "bcm2837.dtsi"
-#include "bcm2835-rpi.dtsi"
+#include "bcm2836-rpi.dtsi"
 #include "bcm283x-rpi-smsc9514.dtsi"
 #include "bcm283x-rpi-usb-host.dtsi"
 
index 7b7ab6aea9887465346d9d625179a650492dcac3..4a89a1885a3dc2f0796f323f366c15a55b9b64b6 100644 (file)
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 #include "bcm2837.dtsi"
-#include "bcm2835-rpi.dtsi"
+#include "bcm2836-rpi.dtsi"
 
 / {
        memory {
diff --git a/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts b/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
new file mode 100644 (file)
index 0000000..babcfec
--- /dev/null
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
+ * Copyright (C) 2018 Rene Kjellerup <rk.katana.steel@gmail.com>
+ */
+
+/dts-v1/;
+
+#include "bcm4708.dtsi"
+#include "bcm5301x-nand-cs0-bch8.dtsi"
+
+/ {
+       compatible = "linksys,ea6500-v2", "brcm,bcm4708";
+       model = "Linksys EA6500 V2";
+
+       chosen {
+               bootargs = "console=ttyS0,115200";
+       };
+
+       memory {
+               reg = <0x00000000 0x08000000>;
+       };
+
+       gpio-keys {
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               wps {
+                       label = "WPS";
+                       linux,code = <KEY_WPS_BUTTON>;
+                       gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+               };
+
+               restart {
+                       label = "Reset";
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+               };
+       };
+};
+
+&usb3_phy {
+       status = "okay";
+};
index 9829d044aaf44a6b4cc2f65dca508b9e3195d44a..ed13af028528e5ed86daf152e0c7731510256cf2 100644 (file)
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /*
  * Broadcom BCM470X / BCM5301X ARM platform code.
  * DTS for BCM47081 SoC.
  *
  * Copyright © 2014 Rafał Miłecki <zajec5@gmail.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
  */
 
 #include "bcm5301x.dtsi"
index c645fea2b7f7e18297ec9a7ddfb3f72d879e4bb7..e1bb8661955f0757da1bd92674817a3f10d8f68c 100644 (file)
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /*
  * Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
- *
- * Licensed under the ISC license.
  */
 
 #include "bcm4708.dtsi"
index f7c3e274b354b8c3ff5946fe36164953aa7a408e..cdc5ff593adb7a60d3f3b23211b08170096caf15 100644 (file)
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /*
  * Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
- *
- * Licensed under the ISC license.
  */
 
 #include "bcm4708.dtsi"
index 19e61b5b066c574d8ee464a6fe91d564c1436e86..e15e2a1e9d8c50a8f1ee87de0929bf282f73049c 100644 (file)
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /*
  * Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
- *
- * Licensed under the ISC license.
  */
 
 /dts-v1/;
index 7a5c188c2676a140aeb542750b25463b0c2d71b3..fd7af943fb0b566a41b6dbdcf5e54dec29b20d0d 100644 (file)
@@ -37,6 +37,8 @@
                        reg = <0x0400 0x100>;
                        interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&iprocslow>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinmux_uart1>;
                        status = "disabled";
                };
        };
                status = "disabled";
        };
 
+       dmu@1800c000 {
+               compatible = "simple-bus";
+               ranges = <0 0x1800c000 0x1000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               cru@100 {
+                       compatible = "simple-bus";
+                       reg = <0x100 0x1a4>;
+                       ranges;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       pin-controller@1c0 {
+                               compatible = "brcm,bcm4708-pinmux";
+                               reg = <0x1c0 0x24>;
+                               reg-names = "cru_gpio_control";
+
+                               spi-pins {
+                                       groups = "spi_grp";
+                                       function = "spi";
+                               };
+
+                               i2c {
+                                       groups = "i2c_grp";
+                                       function = "i2c";
+                               };
+
+                               pwm {
+                                       groups = "pwm0_grp", "pwm1_grp",
+                                                "pwm2_grp", "pwm3_grp";
+                                       function = "pwm";
+                               };
+
+                               pinmux_uart1: uart1 {
+                                       groups = "uart1_grp";
+                                       function = "uart1";
+                               };
+                       };
+               };
+       };
+
        lcpll0: lcpll0@1800c100 {
                #clock-cells = <1>;
                compatible = "brcm,nsp-lcpll0";
index 453a2a37dabd3ccbe04d5668cc762aa52213f568..5054fa9eb0d0f5be7e1600fd0013acafb32811d4 100644 (file)
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /*
  * Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
- *
- * Licensed under the ISC license.
  */
 
 #include <dt-bindings/gpio/gpio.h>
index 6df61518776f7e45ef8a290fd1920ab675ca649c..f59764008b9c6ed3f2d53755fb292ef8d26dcc33 100644 (file)
                        reg = <0x4800e0 0x10>;
                        #reset-cells = <2>;
                };
+
+               ahci: sata@8000 {
+                       compatible = "brcm,bcm63138-ahci", "brcm,sata3-ahci";
+                       reg-names = "ahci", "top-ctrl";
+                       reg = <0xa000 0x9ac>, <0x8040 0x24>;
+                       interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       resets = <&pmb0 3 1>;
+                       reset-names = "ahci";
+                       status = "disabled";
+
+                       sata0: sata-port@0 {
+                               reg = <0>;
+                               phys = <&sata_phy0>;
+                       };
+               };
+
+               sata_phy: sata-phy@8100 {
+                       compatible = "brcm,bcm63138-sata-phy", "brcm,phy-sata3";
+                       reg = <0x8100 0x1e00>;
+                       reg-names = "phy";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+
+                       sata_phy0: sata-phy@0 {
+                               reg = <0>;
+                               #phy-cells = <0>;
+                       };
+               };
        };
 
        /* Legacy UBUS base */
index f9dd342cc2ae499340529c4e842a0da6a1a133b6..21479b4ce8233fc6ad073e97e7593c1c5a9684dc 100644 (file)
        model = "NorthStar Plus SVK (BCM958522ER)";
        compatible = "brcm,bcm58522", "brcm,nsp";
 
-       aliases {
-               serial0 = &uart0;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
index 374508a9cfbfb2820d503c65cfa527066163034c..cda3d790965ba685d02c3da330eddd904120bbf3 100644 (file)
        model = "NorthStar Plus SVK (BCM958525ER)";
        compatible = "brcm,bcm58525", "brcm,nsp";
 
-       aliases {
-               serial0 = &uart0;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
index 403250c5ad8e7b462198185a5add47b2b611e068..f86649812b591ef3488589fe5fd47b8abff78f0c 100644 (file)
        model = "NorthStar Plus XMC (BCM958525xmc)";
        compatible = "brcm,bcm58525", "brcm,nsp";
 
-       aliases {
-               serial0 = &uart0;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
index ecd05e26c2629f4c17031c09bf47596f1bdcf1a4..df60602b054dcf212e63ee3bab3c8b23749104a6 100644 (file)
        model = "NorthStar Plus SVK (BCM958622HR)";
        compatible = "brcm,bcm58622", "brcm,nsp";
 
-       aliases {
-               serial0 = &uart0;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
index f5e85b301497cd21c9597b763abdd4192e3d2e23..3893e7af343a0fa2fc7d5c18779f6cf549ff8487 100644 (file)
        model = "NorthStar Plus SVK (BCM958623HR)";
        compatible = "brcm,bcm58623", "brcm,nsp";
 
-       aliases {
-               serial0 = &uart0;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
index a53a2f629d74198a5c3f4e5d27f0ba5954c0950a..cf226b02141f0e524141dcc4f1a17f2d76382f2f 100644 (file)
        model = "NorthStar Plus SVK (BCM958625HR)";
        compatible = "brcm,bcm58625", "brcm,nsp";
 
-       aliases {
-               serial0 = &uart0;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
index 3ea5f739e90bee0ff555ce3ae168a4fe897ecd37..10b3d512bb330f7fd8886b3f815ce1231f03b846 100644 (file)
        model = "NorthStar Plus SVK (BCM958625K)";
        compatible = "brcm,bcm58625", "brcm,nsp";
 
-       aliases {
-               serial0 = &uart0;
-               serial1 = &uart1;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
index c61673638fa8a090c0a9688478a55e7952f2e1bb..8dca97eeaf57e6a5a66b647c6c8f5b29f0f62421 100644 (file)
                brcm,nand-oob-sectors-size = <16>;
        };
 };
+
+&ahci {
+       status = "okay";
+};
+
+&sata_phy {
+       status = "okay";
+};
index ea9a0806b44605dc96a9ba90ed89dc5c1bdc3c3a..e39db14d805e162b9ed9e92e57dfdca5844e0077 100644 (file)
        model = "NorthStar Plus SVK (BCM988312HR)";
        compatible = "brcm,bcm88312", "brcm,nsp";
 
-       aliases {
-               serial0 = &uart0;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
index 373ea872076929abfe24edadc9716ce72b35aed5..67d86012a85c7185cdf63c3d5f88170e016576ba 100644 (file)
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Device Tree Source for the EMEV2 SoC
+ * Device Tree Source for the Emma Mobile EV2 SoC
  *
  * Copyright (C) 2012 Renesas Solutions Corp.
  */
diff --git a/arch/arm/boot/dts/facebook-bmc-flash-layout.dtsi b/arch/arm/boot/dts/facebook-bmc-flash-layout.dtsi
new file mode 100644 (file)
index 0000000..87bb8b5
--- /dev/null
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright (c) 2018 Facebook Inc.
+
+partitions {
+       compatible = "fixed-partitions";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       u-boot@0 {
+               reg = <0x0 0x60000>;
+               label = "u-boot";
+       };
+
+       u-boot-env@60000 {
+               reg = <0x60000 0x20000>;
+               label = "env";
+       };
+
+       fit@80000 {
+               reg = <0x80000 0x1b80000>;
+               label = "fit";
+       };
+
+       /*
+        * "data0" partition is used by several Facebook BMC platforms
+        * as persistent data store.
+        */
+       data0@1c00000 {
+               reg = <0x1c00000 0x400000>;
+               label = "data0";
+       };
+
+       /*
+        * Although the master partition can be created by enabling
+        * MTD_PARTITIONED_MASTER option, below "flash0" partition is
+        * explicitly created to avoid breaking legacy applications.
+        */
+       flash0@0 {
+               reg = <0x0 0x2000000>;
+               label = "flash0";
+       };
+};
index b560ff88459bf1b74a0c093f3bdc15d2118c0182..5ff9a179c83c3326ab2dec5fdceee155021bf716 100644 (file)
@@ -55,7 +55,7 @@
        };
 
        chosen {
-               stdout-path = "&uart1:115200n8";
+               stdout-path = "serial0:115200n8";
        };
 
        memory@70000000 {
index ed9a980bce8501fcca0c3d357a8440cb8debd59d..beefa1b2049d7b56476a62429c2b4e4abf65ad33 100644 (file)
                        i2c1: i2c@21a0000 {
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               compatible = "fs,imx6sll-i2c", "fsl,imx21-i2c";
+                               compatible = "fsl,imx6sll-i2c", "fsl,imx21-i2c";
                                reg = <0x021a0000 0x4000>;
                                interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6SLL_CLK_I2C1>;
index 53b3408b5fab1845248b2b7ff078eba462f730ab..7d7d679945d28efe4f827e1b6197001088826b7f 100644 (file)
                regulator-name = "enet_3v3";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
-               gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
+               gpio = <&gpio2 6 GPIO_ACTIVE_LOW>;
+               regulator-boot-on;
+               regulator-always-on;
        };
 
        reg_pcie_gpio: regulator-pcie-gpio {
        phy-supply = <&reg_enet_3v3>;
        phy-mode = "rgmii";
        phy-handle = <&ethphy1>;
+       phy-reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
        status = "okay";
 
        mdio {
                                MX6SX_PAD_RGMII1_RD3__ENET1_RX_DATA_3   0x3081
                                MX6SX_PAD_RGMII1_RX_CTL__ENET1_RX_EN    0x3081
                                MX6SX_PAD_ENET2_RX_CLK__ENET2_REF_CLK_25M       0x91
+                               /* phy reset */
+                               MX6SX_PAD_ENET2_CRS__GPIO2_IO_7         0x10b0
                        >;
                };
 
index ca9154dd8052b43de8ed9e945b6896260c1db1f9..e2b1ab9b56e5657eedfc710061db76d962bf4390 100644 (file)
        status = "okay";
 };
 
+&cmt0 {
+       status = "okay";
+};
+
 &hsusb {
        status = "okay";
        pinctrl-0 = <&usb0_pins>;
        };
 };
 
+&rwdt {
+       timeout-sec = <60>;
+       status = "okay";
+};
+
 &scif0 {
        pinctrl-0 = <&scif0_pins>;
        pinctrl-names = "default";
index 0d9faf1a51eac0cca63b54cb272bb1c57e8261d2..0839da07a75ca9e20c7d509bf3137fe7c1bb7801 100644 (file)
                                interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>;
                        };
 
-                       timer@9940 {
+                       timer_abcde: timer@9940 {
                                compatible = "amlogic,meson6-timer";
                                reg = <0x9940 0x18>;
-                               interrupts = <GIC_SPI 10 IRQ_TYPE_EDGE_RISING>;
+                               interrupts = <GIC_SPI 10 IRQ_TYPE_EDGE_RISING>,
+                                            <GIC_SPI 11 IRQ_TYPE_EDGE_RISING>,
+                                            <GIC_SPI 6 IRQ_TYPE_EDGE_RISING>,
+                                            <GIC_SPI 29 IRQ_TYPE_EDGE_RISING>;
                        };
                };
 
index 9444b0d9628f3b08c3fec2ffcbbfaa45af17fa08..fc48cff71ddfd48e720b2f7a6d54090216d72398 100644 (file)
                serial0 = &uart_AO;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        memory {
                reg = <0x40000000 0x80000000>;
        };
index 9b463211339f5f5bc9156e88da3881607ba22ecc..ca978ab952cd6d6ec5f14649ae6e4284c8afbea9 100644 (file)
        status = "disabled";
 };
 
+&timer_abcde {
+       clocks = <&xtal>, <&clk81>;
+       clock-names = "xtal", "pclk";
+};
+
 &uart_AO {
        clocks = <&xtal>, <&clk81>, <&clk81>;
        clock-names = "xtal", "pclk", "baud";
index 8bceb8d343f660a0223865a178af2b1fa17531bf..55fb090a40ef445b2e7c522817b6398efa22f473 100644 (file)
                serial0 = &uart_AO;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        memory {
                reg = <0x40000000 0x80000000>;
        };
index 7162e0ca05b0a5d477fd1369f127e8bef67e8413..3be5fbd07997b71f3adf517589ec7cf3600ffc86 100644 (file)
                        mux {
                                groups = "uart_tx_ao_a", "uart_rx_ao_a";
                                function = "uart_ao";
+                               bias-disable;
                        };
                };
 
                        mux {
                                groups = "i2c_mst_sck_ao", "i2c_mst_sda_ao";
                                function = "i2c_mst_ao";
+                               bias-disable;
                        };
                };
 
                        mux {
                                groups = "remote_input";
                                function = "remote";
+                               bias-disable;
                        };
                };
 
                        mux {
                                groups = "pwm_f_ao";
                                function = "pwm_f_ao";
+                               bias-disable;
                        };
                };
        };
                                groups = "sd_d0_a", "sd_d1_a", "sd_d2_a",
                                        "sd_d3_a", "sd_clk_a", "sd_cmd_a";
                                function = "sd_a";
+                               bias-disable;
                        };
                };
 
                                groups = "sd_d0_b", "sd_d1_b", "sd_d2_b",
                                        "sd_d3_b", "sd_clk_b", "sd_cmd_b";
                                function = "sd_b";
+                               bias-disable;
                        };
                };
 
                                groups = "sd_d0_c", "sd_d1_c", "sd_d2_c",
                                        "sd_d3_c", "sd_clk_c", "sd_cmd_c";
                                function = "sd_c";
+                               bias-disable;
                        };
                };
 
                        mux {
                                groups = "nor_d", "nor_q", "nor_c", "nor_cs";
                                function = "nor";
+                               bias-disable;
                        };
                };
 
                                         "eth_rxd1", "eth_rxd0", "eth_mdio",
                                         "eth_mdc";
                                function = "ethernet";
+                               bias-disable;
                        };
                };
 
                        mux {
                                groups = "pwm_e";
                                function = "pwm_e";
+                               bias-disable;
                        };
                };
 
                                groups = "uart_tx_a1",
                                       "uart_rx_a1";
                                function = "uart_a";
+                               bias-disable;
                        };
                };
 
                                groups = "uart_cts_a1",
                                       "uart_rts_a1";
                                function = "uart_a";
+                               bias-disable;
                        };
                };
        };
        clocks = <&clkc CLKID_CLK81>;
 };
 
+&timer_abcde {
+       clocks = <&clkc CLKID_XTAL>, <&clkc CLKID_CLK81>;
+       clock-names = "xtal", "pclk";
+};
+
 &uart_AO {
        compatible = "amlogic,meson8-uart", "amlogic,meson-uart";
        clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_XTAL>, <&clkc CLKID_CLK81>;
index c7fdaeabbe7b9468289e5d651bb379987d172cd4..5c9b76af8d42b39bff8c6b0e369a98b6b111cd9f 100644 (file)
                serial0 = &uart_AO;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        memory {
                reg = <0x40000000 0x40000000>;
        };
index cd1ca9dda126bb8467107e715f9ff6402f4a181e..587a855f872bc394b6a3e5c6c86c0816f7da8f45 100644 (file)
                        mux {
                                groups = "uart_tx_ao_a", "uart_rx_ao_a";
                                function = "uart_ao";
+                               bias-disable;
                        };
                };
 
                        mux {
                                groups = "remote_input";
                                function = "remote";
+                               bias-disable;
                        };
                };
        };
                                         "eth_txd2",
                                         "eth_txd3";
                                function = "ethernet";
+                               bias-disable;
                        };
                };
 
                                         "eth_mdio_en",
                                         "eth_mdc";
                                function = "ethernet";
+                               bias-disable;
                        };
                };
 
                        mux {
                                groups = "i2c_sda_a", "i2c_sck_a";
                                function = "i2c_a";
+                               bias-disable;
                        };
                };
 
                                groups = "sd_d0_b", "sd_d1_b", "sd_d2_b",
                                        "sd_d3_b", "sd_clk_b", "sd_cmd_b";
                                function = "sd_b";
+                               bias-disable;
                        };
                };
 
                        mux {
                                groups = "pwm_c1";
                                function = "pwm_c";
+                               bias-disable;
                        };
                };
 
                                groups = "uart_tx_b0",
                                       "uart_rx_b0";
                                function = "uart_b";
+                               bias-disable;
                        };
                };
 
                                groups = "uart_cts_b0",
                                       "uart_rts_b0";
                                function = "uart_b";
+                               bias-disable;
                        };
                };
        };
        clock-names = "core", "clkin";
 };
 
+&timer_abcde {
+       clocks = <&clkc CLKID_XTAL>, <&clkc CLKID_CLK81>;
+       clock-names = "xtal", "pclk";
+};
+
 &uart_AO {
        compatible = "amlogic,meson8b-uart", "amlogic,meson-uart";
        clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_XTAL>, <&clkc CLKID_CLK81>;
index 3e1f92273d7be49a0e1e826a6f94a96667dac06c..d1a28c2adac5c0941a6140dbfff960ebc31f5deb 100644 (file)
@@ -45,6 +45,7 @@
                                 "eth_rxd1", "eth_rxd0",
                                 "eth_mdio", "eth_mdc";
                        function = "ethernet";
+                       bias-disable;
                };
        };
 };
index 766bbb8495b60d796ccd857c4965ab4f8d09721c..ee03e08467403ea6ffed9ee8c4e7d993dec1073a 100644 (file)
                                reg-names = "mux status", "mux mask";
                                mrvl,intc-nr-irqs = <2>;
                        };
+
+                       usb_otg_phy0: usb-otg-phy@d4207000 {
+                               compatible = "marvell,mmp2-usb-phy";
+                               reg = <0xd4207000 0x40>;
+                               #phy-cells = <0>;
+                               status = "disabled";
+                       };
+
+                       usb_otg0: usb-otg@d4208000 {
+                               compatible = "marvell,pxau2o-ehci";
+                               reg = <0xd4208000 0x200>;
+                               interrupts = <44>;
+                               clocks = <&soc_clocks MMP2_CLK_USB>;
+                               clock-names = "USBCLK";
+                               phys = <&usb_otg_phy0>;
+                               phy-names = "usb";
+                               status = "disabled";
+                       };
+
+                       mmc1: mmc@d4280000 {
+                               compatible = "mrvl,pxav3-mmc";
+                               reg = <0xd4280000 0x120>;
+                               clocks = <&soc_clocks MMP2_CLK_SDH0>;
+                               clock-names = "io";
+                               interrupts = <39>;
+                               status = "disabled";
+                       };
+
+                       mmc2: mmc@d4280800 {
+                               compatible = "mrvl,pxav3-mmc";
+                               reg = <0xd4280800 0x120>;
+                               clocks = <&soc_clocks MMP2_CLK_SDH1>;
+                               clock-names = "io";
+                               interrupts = <52>;
+                               status = "disabled";
+                       };
+
+                       mmc3: mmc@d4281000 {
+                               compatible = "mrvl,pxav3-mmc";
+                               reg = <0xd4281000 0x120>;
+                               clocks = <&soc_clocks MMP2_CLK_SDH2>;
+                               clock-names = "io";
+                               interrupts = <53>;
+                               status = "disabled";
+                       };
+
+                       mmc4: mmc@d4281800 {
+                               compatible = "mrvl,pxav3-mmc";
+                               reg = <0xd4281800 0x120>;
+                               clocks = <&soc_clocks MMP2_CLK_SDH3>;
+                               clock-names = "io";
+                               interrupts = <54>;
+                               status = "disabled";
+                       };
                };
 
                apb@d4000000 {  /* APB */
                                compatible = "mrvl,mmp-timer";
                                reg = <0xd4014000 0x100>;
                                interrupts = <13>;
+                               clocks = <&soc_clocks MMP2_CLK_TIMER>;
                        };
 
                        uart1: uart@d4030000 {
                                status = "disabled";
                        };
 
-                       gpio@d4019000 {
+                       gpio: gpio@d4019000 {
                                compatible = "marvell,mmp2-gpio";
                                #address-cells = <1>;
                                #size-cells = <1>;
                                clocks = <&soc_clocks MMP2_CLK_GPIO>;
                                resets = <&soc_clocks MMP2_CLK_GPIO>;
                                interrupt-controller;
-                               #interrupt-cells = <1>;
+                               #interrupt-cells = <2>;
                                ranges;
 
                                gcb0: gpio@d4019000 {
                                status = "disabled";
                        };
 
-                       twsi2: i2c@d4025000 {
+                       twsi2: i2c@d4031000 {
                                compatible = "mrvl,mmp-twsi";
-                               reg = <0xd4025000 0x1000>;
-                               interrupts = <58>;
+                               reg = <0xd4031000 0x1000>;
+                               interrupt-parent = <&intcmux17>;
+                               interrupts = <0>;
                                clocks = <&soc_clocks MMP2_CLK_TWSI1>;
                                resets = <&soc_clocks MMP2_CLK_TWSI1>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
+
+                       twsi3: i2c@d4032000 {
+                               compatible = "mrvl,mmp-twsi";
+                               reg = <0xd4032000 0x1000>;
+                               interrupt-parent = <&intcmux17>;
+                               interrupts = <1>;
+                               clocks = <&soc_clocks MMP2_CLK_TWSI2>;
+                               resets = <&soc_clocks MMP2_CLK_TWSI2>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
+
+                       twsi4: i2c@d4033000 {
+                               compatible = "mrvl,mmp-twsi";
+                               reg = <0xd4033000 0x1000>;
+                               interrupt-parent = <&intcmux17>;
+                               interrupts = <2>;
+                               clocks = <&soc_clocks MMP2_CLK_TWSI3>;
+                               resets = <&soc_clocks MMP2_CLK_TWSI3>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
+
+
+                       twsi5: i2c@d4033800 {
+                               compatible = "mrvl,mmp-twsi";
+                               reg = <0xd4033800 0x1000>;
+                               interrupt-parent = <&intcmux17>;
+                               interrupts = <3>;
+                               clocks = <&soc_clocks MMP2_CLK_TWSI4>;
+                               resets = <&soc_clocks MMP2_CLK_TWSI4>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
+
+                       twsi6: i2c@d4034000 {
+                               compatible = "mrvl,mmp-twsi";
+                               reg = <0xd4034000 0x1000>;
+                               interrupt-parent = <&intcmux17>;
+                               interrupts = <4>;
+                               clocks = <&soc_clocks MMP2_CLK_TWSI5>;
+                               resets = <&soc_clocks MMP2_CLK_TWSI5>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                status = "disabled";
                        };
 
                                resets = <&soc_clocks MMP2_CLK_RTC>;
                                status = "disabled";
                        };
+
+                       ssp1: ssp@d4035000 {
+                               compatible = "marvell,mmp2-ssp";
+                               reg = <0xd4035000 0x1000>;
+                               clocks = <&soc_clocks MMP2_CLK_SSP0>;
+                               interrupts = <0>;
+                               status = "disabled";
+                       };
+
+                       ssp2: ssp@d4036000 {
+                               compatible = "marvell,mmp2-ssp";
+                               reg = <0xd4036000 0x1000>;
+                               clocks = <&soc_clocks MMP2_CLK_SSP1>;
+                               interrupts = <1>;
+                               status = "disabled";
+                       };
+
+                       ssp3: ssp@d4037000 {
+                               compatible = "marvell,mmp2-ssp";
+                               reg = <0xd4037000 0x1000>;
+                               clocks = <&soc_clocks MMP2_CLK_SSP2>;
+                               interrupts = <20>;
+                               status = "disabled";
+                       };
+
+                       ssp4: ssp@d4039000 {
+                               compatible = "marvell,mmp2-ssp";
+                               reg = <0xd4039000 0x1000>;
+                               clocks = <&soc_clocks MMP2_CLK_SSP3>;
+                               interrupts = <21>;
+                               status = "disabled";
+                       };
                };
 
                soc_clocks: clocks{
index d5fe55392230de6d2dd7877fb527cb36b3fd63f1..e53d326913080f34e180996bfbed8e8a6320ad69 100644 (file)
                        OMAP3_CORE1_IOPAD(0x2190, PIN_OUTPUT | MUX_MODE0)       /* mcbsp1_dx.mcbsp1_dx */
                        OMAP3_CORE1_IOPAD(0x2192, PIN_INPUT | MUX_MODE0)        /* mcbsp1_dx.mcbsp1_dr */
                        /* mcbsp_clks is used as PENIRQ */
-                       /* OMAP3_CORE1_IOPAD(0x2194, PIN_INPUT | MUX_MODE0)     /* mcbsp_clks.mcbsp_clks */
+                       /* OMAP3_CORE1_IOPAD(0x2194, PIN_INPUT | MUX_MODE0)        mcbsp_clks.mcbsp_clks */
                        OMAP3_CORE1_IOPAD(0x2196, PIN_INPUT | MUX_MODE0)        /* mcbsp_clks.mcbsp1_fsx */
                        OMAP3_CORE1_IOPAD(0x2198, PIN_INPUT | MUX_MODE0)        /* mcbsp1_clkx.mcbsp1_clkx */
                >;
index 3228ad5fb725f0aa507e56b54f55383b32f22a4b..ccbecad9c5c7c45c67d6fab36daa38a4806c3c97 100644 (file)
@@ -35,7 +35,7 @@
                        clocks = <&clks CLK_NONE>;
                };
 
-               pxa27x_ohci: usb@4c000000 {
+               usb0: usb@4c000000 {
                        compatible = "marvell,pxa-ohci";
                        reg = <0x4c000000 0x10000>;
                        interrupts = <3>;
index 080d5c5169b5aed17eceef5406442025d3843256..e83879d97aeae2e29419dc48a504a5a32e153b4d 100644 (file)
@@ -43,8 +43,6 @@
        };
 
        cpus {
-               #address-cells = <0>;
-               #size-cells = <0>;
                cpu {
                        compatible = "marvell,xscale";
                        device_type = "cpu";
                        status = "disabled";
                };
 
-               hwuart: serial@41100000 {
+               hwuart: serial@41600000 {
                        compatible = "mrvl,pxa-uart";
-                       reg = <0x41100000 0x30>;
+                       reg = <0x41600000 0x30>;
                        interrupts = <7>;
                        status = "disabled";
                };
                        status = "disabled";
                };
 
-               usb0: ohci@4c000000 {
-                       compatible = "marvell,pxa-ohci";
-                       reg = <0x4c000000 0x10000>;
-                       interrupts = <3>;
-                       status = "disabled";
-               };
-
                mmc0: mmc@41100000 {
                        compatible = "marvell,pxa-mmc";
                        reg = <0x41100000 0x1000>;
diff --git a/arch/arm/boot/dts/pxa300-raumfeld-common.dtsi b/arch/arm/boot/dts/pxa300-raumfeld-common.dtsi
new file mode 100644 (file)
index 0000000..8ac24e3
--- /dev/null
@@ -0,0 +1,405 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include "pxa3xx.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+
+/ {
+       /* Will be overridden by bootloader */
+       hw-revision = <0>;
+
+       chosen {
+               bootargs = "root=ubi0:RootFS rootfstype=ubifs rw ubi.mtd=3";
+               stdout-path = &ffuart;
+       };
+
+       memory {
+               device_type = "memory";
+               reg = <0xa0000000 0x8000000>;   /* 128 MB */
+       };
+
+       reg_3v3: regulator-3v3 {
+               compatible = "regulator-fixed";
+               regulator-name = "3v3-fixed-supply";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+       };
+
+       reg_1v8: regulator-1v8 {
+               compatible = "regulator-fixed";
+               regulator-name = "1v8-fixed-supply";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               regulator-always-on;
+       };
+
+       reg_va_5v0: regulator-va-5v0 {
+               compatible = "regulator-fixed";
+               regulator-name = "va-5v0-fixed-supply";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               gpio = <&gpio 124 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
+
+       ssp_dai0: ssp-dai0 {
+               compatible = "mrvl,pxa-ssp-dai";
+               pinctrl-names = "default";
+               pinctrl-0 = <&ssp0_dai_pins>;
+               port = <&ssp1>;
+               #sound-dai-cells = <0>;
+               dmas = <&pdma 13 3
+                       &pdma 14 3>;
+               dma-names = "rx", "tx";
+               clock-names = "extclk";
+       };
+
+       ssp_dai1: ssp-dai1 {
+               compatible = "mrvl,pxa-ssp-dai";
+               pinctrl-names = "default";
+               pinctrl-0 = <&ssp1_dai_pins>;
+               port = <&ssp2>;
+               #sound-dai-cells = <0>;
+               dmas = <&pdma 15 3
+                       &pdma 16 3>;
+               dma-names = "rx", "tx";
+               clock-names = "extclk";
+       };
+
+       spi: spi {
+               compatible = "spi-gpio";
+               #address-cells = <0x1>;
+               #size-cells = <0>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&spi_pins>;
+               gpio-sck = <&gpio 95 GPIO_ACTIVE_HIGH>;
+               gpio-miso = <&gpio 98 GPIO_ACTIVE_HIGH>;
+               gpio-mosi = <&gpio 97 GPIO_ACTIVE_HIGH>;
+               cs-gpios = <
+                       &gpio 34 GPIO_ACTIVE_HIGH
+                       &gpio 125 GPIO_ACTIVE_HIGH
+                       &gpio 96 GPIO_ACTIVE_HIGH
+               >;
+               num-chipselects = <3>;
+
+               dac: dac@2 {
+                       compatible = "ti,dac7512";
+                       reg = <2>;
+                       spi-max-frequency = <1000000>;
+                       vcc-supply = <&reg_3v3>;
+               };
+       };
+
+       keys: gpio-keys {
+               compatible = "gpio-keys";
+               pinctrl-names = "default";
+               pinctrl-0 = <&gpio_keys_pins>;
+
+               on-off {
+                       label = "on_off button";
+                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_F6>;
+               };
+
+               rescue-boot {
+                       label = "rescue boot button";
+                       gpios = <&gpio 115 GPIO_ACTIVE_HIGH>;
+                       linux,code = <KEY_F4>;
+               };
+
+               setup {
+                       label = "setup";
+                       gpios = <&gpio 119 GPIO_ACTIVE_HIGH>;
+                       linux,code = <KEY_F3>;
+               };
+       };
+
+       rotary: rotary-encoder {
+               compatible = "rotary-encoder";
+               gpios = <
+                       &gpio 19 GPIO_ACTIVE_LOW
+                       &gpio 20 GPIO_ACTIVE_HIGH
+               >;
+               linux,axis = <REL_X>;
+               rotary-encoder,relative-axis;
+       };
+
+       leds: leds {
+               compatible = "gpio-leds";
+               pinctrl-names = "default";
+               pinctrl-0 = <&led_pins_a &led_pins_b>;
+
+               left {
+                       label = "raumfeld:1";
+                       gpios = <&gpio 36 GPIO_ACTIVE_LOW>;
+               };
+
+               right {
+                       label = "raumfeld:2";
+                       gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
+               };
+       };
+
+       poweroff {
+               compatible = "gpio-poweroff";
+               pinctrl-names = "default";
+               pinctrl-0 = <&poweroff_pins>;
+               gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
+       };
+
+       mmc0_pwrseq: mmc-pwrseq {
+               compatible = "mmc-pwrseq-simple";
+               pinctrl-names = "default";
+               pinctrl-0 = <&mmc0_pwrseq_pins>;
+               reset-gpios = <
+                       &gpio 113 GPIO_ACTIVE_LOW       /* W2W_RESET    */
+                       &gpio 114 GPIO_ACTIVE_LOW       /* W2W_PDN      */
+               >;
+       };
+
+       ethernet: ethernet@10000000 {
+               compatible = "smsc,lan9115";
+               pinctrl-names = "default";
+               pinctrl-0 = <&smsc_pins &smsc_bus_pins>;
+               reg = <0x10000000 0x100000>;
+               phy-mode = "mii";
+               interrupt-parent = <&gpio>;
+               interrupts = <40 IRQ_TYPE_EDGE_FALLING>;
+               vdd33a-supply = <&reg_3v3>;
+               vddvario-supply = <&reg_1v8>;
+               reset-gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
+               reg-io-width = <4>;
+               smsc,save-mac-address;
+               smsc,irq-push-pull;
+       };
+};
+
+&ffuart {
+       status = "okay";
+};
+
+&pwri2c {
+       status = "okay";
+
+       max8660: regulator@34 {
+               compatible = "maxim,max8660";
+               reg = <0x34>;
+
+               regulators {
+                       regulator-v3 {
+                               regulator-compatible= "V3(DCDC)";
+                               regulator-min-microvolt = <725000>;
+                               regulator-max-microvolt = <1800000>;
+                       };
+
+                       regulator-v4 {
+                               regulator-compatible= "V4(DCDC)";
+                               regulator-min-microvolt = <725000>;
+                               regulator-max-microvolt = <1800000>;
+                       };
+
+                       regulator-v5 {
+                               regulator-compatible= "V5(LDO)";
+                               regulator-min-microvolt = <1700000>;
+                               regulator-max-microvolt = <2000000>;
+                       };
+
+                       reg_vcc_sdio: regulator-v6 {
+                               regulator-compatible= "V6(LDO)";
+                               regulator-min-microvolt = <3300000>;
+                               regulator-max-microvolt = <3300000>;
+                       };
+
+                       regulator-v7 {
+                               regulator-compatible= "V7(LDO)";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                       };
+               };
+       };
+};
+
+&pxai2c1 {
+       status = "okay";
+       mrvl,i2c-fast-mode;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pxai2c1_pins>;
+};
+
+&ssp1 {
+       status = "okay";
+};
+
+&ssp2 {
+       status = "okay";
+};
+
+&nand_controller {
+       status = "okay";
+
+       nand@0 {
+               reg = <0>;
+               nand-rb = <0>;
+               nand-ecc-mode = "hw";
+               marvell,nand-keep-config;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "Bootloader";
+                               reg = <0x0000000 0xa0000>;
+                               read-only;
+                       };
+
+                       partition@a0000 {
+                               label = "BootloaderEnvironment";
+                               reg = <0x0a0000 0x20000>;
+                       };
+
+                       partition@c0000 {
+                               label = "BootloaderSplashScreen";
+                               reg = <0x0c0000 0x60000>;
+                       };
+
+                       partition@120000 {
+                               label = "UBI";
+                               reg = <0x120000 0x7ee0000>;
+                       };
+               };
+       };
+};
+
+&usb0 {
+       status = "okay";
+       marvell,enable-port1;
+       marvell,port-mode = <2>; /* PMM_GLOBAL_MODE */
+       pinctrl-names = "default";
+       pinctrl-0 = <&pxa3xx_ohci_pins>;
+};
+
+&mmc0 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&mmc0_pins>;
+       pxa-mmc,detect-delay-ms = <200>;
+       vmmc-supply = <&reg_vcc_sdio>;
+       mmc-pwrseq = <&mmc0_pwrseq>;
+       non-removable;
+       bus-width = <4>;
+};
+
+&pinctrl {
+       poweroff_pins: poweroff-pins {
+               pinctrl-single,pins = <MFP_PIN_PXA300(16) MFP_AF0>;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_FLOAT);
+       };
+
+       led_pins_a: led-pins-a {
+               pinctrl-single,pins = <MFP_PIN_PXA300(35) MFP_AF0>;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_PULL_LOW);
+       };
+
+       led_pins_b: led-pins-b {
+               pinctrl-single,pins = <MFP_PIN_PXA300(36) MFP_AF0>;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_DRIVE_HIGH);
+       };
+
+       pxai2c1_pins: pxai2c1-pins {
+               pinctrl-single,pins = <
+                       MFP_PIN_PXA300(21) MFP_AF1      /* I2C_SCL      */
+                       MFP_PIN_PXA300(22) MFP_AF1      /* I2C_SDA      */
+               >;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_PULL_HIGH);
+       };
+
+       gpio_keys_pins: gpio-keys-pins {
+               pinctrl-single,pins = <
+                       MFP_PIN_PXA300(14) MFP_AF0      /* SCK          */
+                       MFP_PIN_PXA300(115) MFP_AF0     /* MOSI         */
+                       MFP_PIN_PXA300(119) MFP_AF0     /* MISO         */
+               >;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_FLOAT);
+       };
+
+       spi_pins: spi-pins {
+               pinctrl-single,pins = <
+                       MFP_PIN_PXA300(95) MFP_AF0      /* SCK          */
+                       MFP_PIN_PXA300(97) MFP_AF0      /* MOSI         */
+                       MFP_PIN_PXA300(98) MFP_AF0      /* MISO         */
+                       MFP_PIN_PXA300(34) MFP_AF0      /* CS#0         */
+                       MFP_PIN_PXA300(125) MFP_AF0     /* CS#1         */
+                       MFP_PIN_PXA300(96) MFP_AF0      /* CS#2         */
+               >;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_PULL_LOW);
+       };
+
+       pxa3xx_ohci_pins: pxa3xx-ohci-pins {
+               pinctrl-single,pins = <
+                       MFP_PIN_PXA300_2(0) MFP_AF1     /* USBHPEN      */
+                       MFP_PIN_PXA300_2(1) MFP_AF1     /* USBHPWR      */
+               >;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_PULL_LOW);
+       };
+
+       smsc_pins: smsc-pins {
+               pinctrl-single,pins = <
+                       MFP_PIN_PXA300(39) MFP_AF0      /* RESET        */
+                       MFP_PIN_PXA300(40) MFP_AF0      /* IRQ          */
+               >;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_PULL_LOW);
+       };
+
+       smsc_bus_pins: smsc-bus-pins {
+               pinctrl-single,pins = <
+                       MFP_PIN_PXA300(1) MFP_AF1       /* nCS2         */
+               >;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_FLOAT);
+       };
+
+       mmc0_pins: mmc0-pins {
+               pinctrl-single,pins = <
+                       MFP_PIN_PXA300(3) MFP_AF4       /* MMC1_DAT0    */
+                       MFP_PIN_PXA300(4) MFP_AF4       /* MMC1_DAT1    */
+                       MFP_PIN_PXA300(5) MFP_AF4       /* MMC1_DAT2    */
+                       MFP_PIN_PXA300(6) MFP_AF4       /* MMC1_DAT3    */
+                       MFP_PIN_PXA300(7) MFP_AF4       /* MMC1_CLK     */
+                       MFP_PIN_PXA300(8) MFP_AF4       /* MMC1_CMD     */
+               >;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_DRIVE_HIGH);
+       };
+
+       mmc0_pwrseq_pins: mmc0-pwrseq-pins {
+               pinctrl-single,pins = <
+                       MFP_PIN_PXA300(113) MFP_AF0     /* W2W_RESET    */
+                       MFP_PIN_PXA300(114) MFP_AF0     /* W2W_PDN      */
+               >;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_FLOAT);
+       };
+
+       ssp0_dai_pins: ssp0-dai-pins {
+               pinctrl-single,pins = <
+                       MFP_PIN_PXA300(85) MFP_AF1      /* SSP1_SCLK    */
+                       MFP_PIN_PXA300(86) MFP_AF1      /* SSP1_FRM     */
+                       MFP_PIN_PXA300(87) MFP_AF1      /* SSP1_TXD     */
+                       MFP_PIN_PXA300(88) MFP_AF1      /* SSP1_RXD     */
+                       MFP_PIN_PXA300(89) MFP_AF1      /* SSP1_EXTCLK  */
+                       MFP_PIN_PXA300(90) MFP_AF1      /* SSP1_SYSCLK  */
+               >;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_PULL_LOW);
+       };
+
+       ssp1_dai_pins: ssp1-dai-pins {
+               pinctrl-single,pins = <
+                       MFP_PIN_PXA300(25) MFP_AF2      /* SSP2_SCLK    */
+                       MFP_PIN_PXA300(26) MFP_AF2      /* SSP2_FRM     */
+                       MFP_PIN_PXA300(27) MFP_AF2      /* SSP2_TXD     */
+                       MFP_PIN_PXA300(29) MFP_AF2      /* SSP2_EXTCLK  */
+               >;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_PULL_LOW);
+       };
+};
diff --git a/arch/arm/boot/dts/pxa300-raumfeld-connector.dts b/arch/arm/boot/dts/pxa300-raumfeld-connector.dts
new file mode 100644 (file)
index 0000000..3e94454
--- /dev/null
@@ -0,0 +1,73 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/dts-v1/;
+
+#include "pxa300-raumfeld-common.dtsi"
+#include "pxa300-raumfeld-tuneable-clock.dtsi"
+
+/ {
+       model = "Raumfeld Connector (PXA3xx)";
+       compatible = "raumfeld,raumfeld-connector-pxa303", "marvell,pxa300";
+
+       sound {
+               compatible = "simple-audio-card";
+               simple-audio-card,name = "Raumfeld Connector";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               simple-audio-card,dai-link@0 {
+                       reg = <0>;
+                       format = "i2s";
+                       bitclock-master = <&dailink_master_analog>;
+                       frame-master = <&dailink_master_analog>;
+                       mclk-fs = <256>;
+
+                       dailink_master_analog: cpu {
+                               sound-dai = <&ssp_dai0>;
+                       };
+
+                       codec {
+                               sound-dai = <&cs4270>;
+                       };
+               };
+
+               simple-audio-card,dai-link@1 {
+                       reg = <1>;
+                       format = "i2s";
+                       bitclock-master = <&dailink_master_digital>;
+                       frame-master = <&dailink_master_digital>;
+                       mclk-fs = <256>;
+
+                       dailink_master_digital: cpu {
+                               sound-dai = <&ssp_dai1>;
+                       };
+
+                       codec {
+                               sound-dai = <&ak4104>;
+                       };
+               };
+       };
+};
+
+&ssp1 {
+       status = "okay";
+};
+
+&ssp2 {
+       status = "okay";
+};
+
+&spi {
+       ak4104: optical-transmitter@0 {
+               compatible = "asahi-kasei,ak4104";
+               reg = <0>;
+               vdd-supply = <&reg_3v3>;
+               spi-max-frequency = <5000000>;
+               reset-gpios = <&gpio 38 GPIO_ACTIVE_HIGH>;
+               #sound-dai-cells = <0>;
+       };
+};
+
+&rotary {
+       status = "disabled";
+};
diff --git a/arch/arm/boot/dts/pxa300-raumfeld-controller.dts b/arch/arm/boot/dts/pxa300-raumfeld-controller.dts
new file mode 100644 (file)
index 0000000..65d8250
--- /dev/null
@@ -0,0 +1,266 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/dts-v1/;
+
+#include "pxa300-raumfeld-common.dtsi"
+
+/ {
+       model = "Raumfeld Controller (PXA3xx)";
+       compatible = "raumfeld,raumfeld-controller-pxa303", "marvell,pxa300";
+
+       reg_vbatt: regulator-vbatt {
+               compatible = "regulator-fixed";
+               regulator-name = "vbatt-fixed-supply";
+               regulator-min-microvolt = <3700000>;
+               regulator-max-microvolt = <3700000>;
+               regulator-always-on;
+       };
+
+       lcd_supply: regulator-va-tft {
+               compatible = "regulator-fixed";
+               regulator-name = "va-tft-fixed-supply";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               gpio = <&gpio 33 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
+
+       onewire {
+               compatible = "w1-gpio";
+               pinctrl-names = "default";
+               pinctrl-0 = <&w1_pins>;
+               gpios = <
+                       &gpio 126 GPIO_OPEN_DRAIN       /* W1 I/O       */
+                       &gpio 105 GPIO_ACTIVE_HIGH      /* pullup       */
+               >;
+
+               w1_ds2760: slave-ds2760 {
+                       compatible = "maxim,ds2760";
+                       power-supplies = <&charger>;
+               };
+       };
+
+       charger: charger {
+               compatible = "gpio-charger";
+               charger-type = "mains";
+               gpios = <&gpio 101 GPIO_ACTIVE_LOW>;
+       };
+
+       /*
+        * One of the following two will be set to "okay" by the bootloader,
+        * depending on the hardware revision.
+        */
+       backlight-controller-pwm {
+               compatible = "pwm-backlight";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pwm0_pins>;
+               pwms = <&pwm0 10000>;
+               power-supply = <&reg_vbatt>;
+               status = "disabled";
+
+               brightness-levels = <
+                        0  1  2  3  4  5  6  7  8  9
+                       10 11 12 13 14 15 16 17 18 19
+                       20 21 22 23 24 25 26 27 28 29
+                       30 31 32 33 34 35 36 37 38 39
+                       40 41 42 43 44 45 46 47 48 49
+                       50 51 52 53 54 55 56 57 58 59
+                       60 61 62 63 64 65 66 67 68 69
+                       70 71 72 73 74 75 76 77 78 79
+                       80 81 82 83 84 85 86 87 88 89
+                       90 91 92 93 94 95 96 97 98 99
+                       100
+               >;
+               default-brightness-level = <100>;
+       };
+
+       backlight-controller {
+               compatible = "lltc,lt3593";
+               pinctrl-names = "default";
+               pinctrl-0 = <&lt3593_pins>;
+               lltc,ctrl-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
+               status = "disabled";
+
+               led {
+                       label = "backlight";
+                       default-state = "on";
+               };
+       };
+};
+
+&reg_va_5v0 {
+       status = "disabled";
+};
+
+&ethernet {
+       status = "disabled";
+};
+
+&leds {
+       status = "disabled";
+};
+
+&dac {
+       status = "disabled";
+};
+
+&pwm0 {
+       status = "okay";
+};
+
+&keys {
+       dock-detect {
+               label = "dock detect";
+               gpios = <&gpio 116 GPIO_ACTIVE_HIGH>;
+               linux,code = <KEY_F5>;
+       };
+};
+
+&spi {
+       accelerometer@1 {
+               compatible = "st,lis302dl-spi";
+               pinctrl-names = "default";
+               pinctrl-0 = <&lis302_pins>;
+               reg = <1>;
+               spi-max-frequency = <1000000>;
+               interrupt-parent = <&gpio>;
+               interrupts = <104 IRQ_TYPE_EDGE_FALLING>;
+
+               st,click-single-x;
+               st,click-single-y;
+               st,click-single-z;
+               st,click-thresh-x = <10>;
+               st,click-thresh-y = <10>;
+               st,click-thresh-z = <10>;
+               st,irq1-click;
+               st,irq2-click;
+               st,wakeup-x-lo;
+               st,wakeup-x-hi;
+               st,wakeup-y-lo;
+               st,wakeup-y-hi;
+               st,wakeup-z-lo;
+               st,wakeup-z-hi;
+       };
+};
+
+&lcdc {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&lcdc_pins>;
+       lcd-supply = <&lcd_supply>;
+
+       port {
+               lcdc_out: endpoint {
+                       remote-endpoint = <&panel_in>;
+                       bus-width = <16>;
+               };
+       };
+
+       panel {
+               compatible = "sharp,lq043t3dx0-panel";
+               display-timings {
+                       native-mode = <&timing0>;
+                       timing0: timing {
+                               clock-frequency = <9009000>;
+                               pixelclk-active = <0>;  /* negative edge */
+                               hactive = <480>;
+                               vactive = <272>;
+                               hsync-len = <41>;
+                               hback-porch = <2>;
+                               hfront-porch = <1>;
+                               vsync-len = <10>;
+                               vback-porch = <3>;
+                               vfront-porch = <1>;
+                       };
+               };
+
+               port {
+                       panel_in: endpoint {
+                               remote-endpoint = <&lcdc_out>;
+                       };
+               };
+       };
+};
+
+&gcu {
+       status = "okay";
+};
+
+&pxai2c1 {
+       touchscreen@a {
+               compatible = "eeti,exc3000-i2c";
+               pinctrl-names = "default";
+               pinctrl-0 = <&eeti_ts_pins>;
+               reg = <0xa>;
+               interrupt-parent = <&gpio>;
+               interrupts = <32 IRQ_TYPE_EDGE_RISING>;
+               attn-gpios = <&gpio 32 GPIO_ACTIVE_HIGH>;
+               touchscreen-inverted-y;
+       };
+};
+
+&pinctrl {
+       lis302_pins: lis302-pins {
+               pinctrl-single,pins = <
+                       MFP_PIN_PXA300(104) MFP_AF0     /* IRQ  */
+               >;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_PULL_LOW);
+       };
+
+       eeti_ts_pins: eeti-ts-pins {
+               pinctrl-single,pins = <
+                       MFP_PIN_PXA300(32) MFP_AF0      /* IRQ */
+               >;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_FLOAT);
+       };
+
+       lt3593_pins: lt3593-pins {
+               pinctrl-single,pins = <
+                       MFP_PIN_PXA300(17) MFP_AF0      /* Backlight    */
+               >;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_PULL_LOW);
+       };
+
+       pwm0_pins: pwm0-pins {
+               pinctrl-single,pins = <
+                       MFP_PIN_PXA300(17) MFP_AF1      /* PWM  */
+               >;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_PULL_LOW);
+       };
+
+       w1_pins: w1-pins {
+               pinctrl-single,pins = <
+                       MFP_PIN_PXA300(126) MFP_AF0     /* PWM  */
+                       MFP_PIN_PXA300(105) MFP_AF0     /* PWM  */
+               >;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_FLOAT);
+       };
+
+       lcdc_pins: lcdc-pins {
+               pinctrl-single,pins = <
+                       MFP_PIN_PXA300(54) MFP_AF1      /* LDD_0        */
+                       MFP_PIN_PXA300(55) MFP_AF1      /* LDD_1        */
+                       MFP_PIN_PXA300(56) MFP_AF1      /* LDD_2        */
+                       MFP_PIN_PXA300(57) MFP_AF1      /* LDD_3        */
+                       MFP_PIN_PXA300(58) MFP_AF1      /* LDD_4        */
+                       MFP_PIN_PXA300(59) MFP_AF1      /* LDD_5        */
+                       MFP_PIN_PXA300(60) MFP_AF1      /* LDD_6        */
+                       MFP_PIN_PXA300(61) MFP_AF1      /* LDD_7        */
+                       MFP_PIN_PXA300(62) MFP_AF1      /* LDD_8        */
+                       MFP_PIN_PXA300(63) MFP_AF1      /* LDD_9        */
+                       MFP_PIN_PXA300(64) MFP_AF1      /* LDD_10       */
+                       MFP_PIN_PXA300(65) MFP_AF1      /* LDD_11       */
+                       MFP_PIN_PXA300(66) MFP_AF1      /* LDD_12       */
+                       MFP_PIN_PXA300(67) MFP_AF1      /* LDD_13       */
+                       MFP_PIN_PXA300(68) MFP_AF1      /* LDD_14       */
+                       MFP_PIN_PXA300(69) MFP_AF1      /* LDD_15       */
+                       MFP_PIN_PXA300(70) MFP_AF1      /* LDD_16       */
+                       MFP_PIN_PXA300(71) MFP_AF1      /* LDD_17       */
+                       MFP_PIN_PXA300(72) MFP_AF1      /* LCD_FCLK     */
+                       MFP_PIN_PXA300(73) MFP_AF1      /* LCD_LCLK     */
+                       MFP_PIN_PXA300(74) MFP_AF1      /* LCD_PCLK     */
+                       MFP_PIN_PXA300(75) MFP_AF1      /* LCD_BIAS     */
+               >;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_PULL_LOW);
+       };
+};
diff --git a/arch/arm/boot/dts/pxa300-raumfeld-speaker-l.dts b/arch/arm/boot/dts/pxa300-raumfeld-speaker-l.dts
new file mode 100644 (file)
index 0000000..5a0f7f1
--- /dev/null
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/dts-v1/;
+
+#include "pxa300-raumfeld-common.dtsi"
+#include "pxa300-raumfeld-tuneable-clock.dtsi"
+
+/ {
+       model = "Raumfeld Speaker L (PXA3xx)";
+       compatible = "raumfeld,raumfeld-speaker-l-pxa303", "marvell,pxa300";
+};
diff --git a/arch/arm/boot/dts/pxa300-raumfeld-speaker-m.dts b/arch/arm/boot/dts/pxa300-raumfeld-speaker-m.dts
new file mode 100644 (file)
index 0000000..fa10d89
--- /dev/null
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/dts-v1/;
+
+#include "pxa300-raumfeld-common.dtsi"
+#include "pxa300-raumfeld-tuneable-clock.dtsi"
+
+/ {
+       model = "Raumfeld Speaker M (PXA3xx)";
+       compatible = "raumfeld,raumfeld-speaker-m-pxa303", "marvell,pxa300";
+};
diff --git a/arch/arm/boot/dts/pxa300-raumfeld-speaker-one.dts b/arch/arm/boot/dts/pxa300-raumfeld-speaker-one.dts
new file mode 100644 (file)
index 0000000..5f9e375
--- /dev/null
@@ -0,0 +1,137 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/dts-v1/;
+
+#include "pxa300-raumfeld-common.dtsi"
+
+/ {
+       model = "Raumfeld Speaker One (PXA3xx)";
+       compatible = "raumfeld,raumfeld-speaker-one-pxa303", "marvell,pxa300";
+
+       wm8782: wm8782 {
+               compatible = "wm8782";
+               #sound-dai-cells = <0>;
+               Vdd-supply = <&reg_3v3>;
+               Vdda-supply = <&reg_va_5v0>;
+       };
+
+       xo_11mhz: oscillator-11mhz {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <11289600>;
+               clock-accuracy = <100>;
+       };
+
+       xo_audio: clock-gate {
+               compatible = "gpio-gate-clock";
+               pinctrlnames = "default";
+               pinctrl-0 = <&xo_audio_pins>;
+               clocks = <&xo_11mhz>;
+               #clock-cells = <0>;
+               enable-gpios = <&gpio 111 GPIO_ACTIVE_HIGH>;
+       };
+
+       reg_va_30v0: regulator-va-30v0 {
+               compatible = "regulator-fixed";
+               regulator-name = "va-30v0-fixed-supply";
+               regulator-min-microvolt = <30000000>;
+               regulator-max-microvolt = <30000000>;
+       };
+
+       sound {
+               compatible = "simple-audio-card";
+               simple-audio-card,name = "Raumfeld Speaker";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               simple-audio-card,dai-link@0 {
+                       reg = <0>;
+                       format = "i2s";
+                       bitclock-master = <&dailink_master_analog_out>;
+                       frame-master = <&dailink_master_analog_out>;
+                       mclk-fs = <256>;
+
+                       dailink_master_analog_out: cpu {
+                               sound-dai = <&ssp_dai0>;
+                       };
+
+                       codec {
+                               sound-dai = <&sta320>;
+                       };
+               };
+
+               simple-audio-card,dai-link@1 {
+                       reg = <1>;
+                       format = "i2s";
+                       bitclock-master = <&dailink_master_analog_in>;
+                       frame-master = <&dailink_master_analog_in>;
+                       mclk-fs = <256>;
+
+                       dailink_master_analog_in: cpu {
+                               sound-dai = <&ssp_dai0>;
+                       };
+
+                       codec {
+                               sound-dai = <&wm8782>;
+                       };
+               };
+       };
+};
+
+&ssp_dai0 {
+       clocks = <&xo_audio>;
+};
+
+&spi {
+       dac@2 {
+               compatible = "ti,dac7512";
+               reg = <2>;
+               spi-max-frequency = <1000000>;
+               vcc-supply = <&reg_3v3>;
+       };
+};
+
+&rotary {
+       status = "okay";
+};
+
+&pxai2c1 {
+       sta320: codec@1a {
+               compatible = "st,sta32x";
+               reg = <0x1a>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&sta320_pins>;
+               clocks = <&xo_audio>;
+               clock-names = "xti";
+               reset-gpios = <&gpio 120 GPIO_ACTIVE_HIGH>;
+               Vdda-supply = <&reg_3v3>;
+               Vdd3-supply = <&reg_3v3>;
+               Vcc-supply = <&reg_va_30v0>;
+               #sound-dai-cells = <0>;
+               st,thermal-warning-adjustment;
+               st,thermal-warning-recovery;
+               st,fault-detect-recovery;
+               st,drop-compensation-ns = <80>;
+               st,max-power-use-mpcc;
+               st,invalid-input-detect-mute;
+               /* 2 (half-bridge) and 1 (full-bridge) on-board power */
+               st,output-conf = /bits/ 8 <0x1>;
+               st,needs_esd_watchdog;
+       };
+};
+
+&pinctrl {
+       xo_audio_pins: xo-audio-pins {
+               pinctrl-single,pins = <
+                       MFP_PIN_PXA300(111) MFP_AF0     /* ENABLE */
+               >;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_PULL_LOW);
+       };
+
+       sta320_pins: sta320-pins {
+               pinctrl-single,pins = <
+                       MFP_PIN_PXA300(120) MFP_AF0     /* CODEC_RESET  */
+               >;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_FLOAT);
+       };
+};
diff --git a/arch/arm/boot/dts/pxa300-raumfeld-speaker-s.dts b/arch/arm/boot/dts/pxa300-raumfeld-speaker-s.dts
new file mode 100644 (file)
index 0000000..36e20cb
--- /dev/null
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/dts-v1/;
+
+#include "pxa300-raumfeld-common.dtsi"
+#include "pxa300-raumfeld-tuneable-clock.dtsi"
+
+/ {
+       model = "Raumfeld Speaker S (PXA3xx)";
+       compatible = "raumfeld,raumfeld-speaker-s-pxa303", "marvell,pxa300";
+};
diff --git a/arch/arm/boot/dts/pxa300-raumfeld-tuneable-clock.dtsi b/arch/arm/boot/dts/pxa300-raumfeld-tuneable-clock.dtsi
new file mode 100644 (file)
index 0000000..561483b
--- /dev/null
@@ -0,0 +1,85 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <dt-bindings/clock/maxim,max9485.h>
+
+/ {
+       xo_27mhz: oscillator-27mhz {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <27000000>;
+               clock-accuracy = <100>;
+       };
+
+       sound {
+               compatible = "simple-audio-card";
+               simple-audio-card,name = "Raumfeld Speaker";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               simple-audio-card,dai-link@0 {
+                       reg = <0>;
+                       format = "i2s";
+                       bitclock-master = <&dailink_master_analog>;
+                       frame-master = <&dailink_master_analog>;
+                       mclk-fs = <256>;
+
+                       dailink_master_analog: cpu {
+                               sound-dai = <&ssp_dai0>;
+                       };
+
+                       codec {
+                               sound-dai = <&cs4270>;
+                       };
+               };
+       };
+};
+
+&ssp_dai0 {
+       clocks = <&max9485 MAX9485_CLKOUT1>;
+};
+
+&ssp_dai1 {
+       clocks = <&max9485 MAX9485_CLKOUT1>;
+};
+
+&pxai2c1 {
+       cs4270: codec@48 {
+               compatible = "cirrus,cs4270";
+               pinctrl-names = "default";
+               pinctrl-0 = <&cs4270_pins>;
+               reg = <0x48>;
+               va-supply = <&reg_va_5v0>;
+               vd-supply = <&reg_3v3>;
+               vlc-supply = <&reg_3v3>;
+               reset-gpios = <&gpio 120 GPIO_ACTIVE_HIGH>;
+               #sound-dai-cells = <0>;
+       };
+
+       max9485: clock-generator@63 {
+               compatible = "maxim,max9485";
+               pinctrl-names = "default";
+               pinctrl-0 = <&max9485_pins>;
+               reg = <0x63>;
+               vdd-supply = <&reg_3v3>;
+               clock-names = "xclk";
+               clocks = <&xo_27mhz>;
+               reset-gpios = <&gpio 111 GPIO_ACTIVE_HIGH>;
+               #clock-cells = <1>;
+       };
+};
+
+&pinctrl {
+       cs4270_pins: cs4270-pins {
+               pinctrl-single,pins = <
+                       MFP_PIN_PXA300(120) MFP_AF0     /* RESET */
+               >;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_PULL_LOW);
+       };
+
+       max9485_pins: max9485-pins {
+               pinctrl-single,pins = <
+                       MFP_PIN_PXA300(111) MFP_AF0     /* RESET */
+               >;
+               pinctrl-single,low-power-mode = MFP_LPM(MFP_LPM_PULL_LOW);
+       };
+};
index 3a8f0edc3af99dea946c13417946e5a9c0456245..e1e607f53ce637551e30c7c8922c4402e487c686 100644 (file)
                pinctrl: pinctrl@40e10000 {
                        compatible = "pinconf-single";
                        reg = <0x40e10000 0xffff>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
                        #pinctrl-cells = <1>;
                        pinctrl-single,register-width = <32>;
                        pinctrl-single,function-mask = <0x7>;
                        status = "disabled";
                };
 
-               pxa3xx_ohci: usb@4c000000 {
+               usb0: usb@4c000000 {
                        compatible = "marvell,pxa-ohci";
                        reg = <0x4c000000 0x10000>;
                        interrupts = <3>;
                        clocks = <&clks CLK_SSP4>;
                        status = "disabled";
                };
+
+               timer@40a00000 {
+                       compatible = "marvell,pxa-timer";
+                       reg = <0x40a00000 0x20>;
+                       interrupts = <26>;
+                       clocks = <&clks CLK_OSTIMER>;
+                       status = "okay";
+               };
+
+               gcu: display-controller@54000000 {
+                       compatible = "marvell,pxa300-gcu";
+                       reg = <0x54000000 0x1000>;
+                       interrupts = <39>;
+                       clocks = <&clks CLK_PXA300_GCU>;
+                       status = "disabled";
+               };
        };
 
        clocks {
                #size-cells = <1>;
                ranges;
 
-               clks: pxa3xx_clks@41300004 {
+               clks: clocks {
                        compatible = "marvell,pxa300-clocks";
                        #clock-cells = <1>;
                        status = "okay";
                };
        };
-
-       timer@40a00000 {
-               compatible = "marvell,pxa-timer";
-               reg = <0x40a00000 0x20>;
-               interrupts = <26>;
-               clocks = <&clks CLK_OSTIMER>;
-               status = "okay";
-       };
 };
diff --git a/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval-pins.dtsi b/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval-pins.dtsi
deleted file mode 100644 (file)
index 8df7315..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-&tlmm_pinmux {
-       card_detect: card-detect {
-               mux {
-                       pins = "gpio26";
-                       function = "gpio";
-                       bias-disable;
-               };
-       };
-
-       pcie_pins: pcie-pinmux {
-               mux {
-                       pins = "gpio27";
-                       function = "gpio";
-               };
-               conf {
-                       pins = "gpio27";
-                       drive-strength = <12>;
-                       bias-disable;
-               };
-       };
-
-       user_leds: user-leds {
-               mux {
-                       pins = "gpio3", "gpio7", "gpio10", "gpio11";
-                       function = "gpio";
-               };
-
-               conf {
-                       pins = "gpio3", "gpio7", "gpio10", "gpio11";
-                       function = "gpio";
-                       output-low;
-               };
-       };
-
-       magneto_pins: magneto-pins {
-               mux {
-                       pins = "gpio31", "gpio48";
-                       function = "gpio";
-                       bias-disable;
-               };
-       };
-};
-
-&pm8921_mpps {
-       mpp_leds: mpp-leds {
-               pinconf {
-                       pins = "mpp7", "mpp8";
-                       function = "digital";
-                       output-low;
-               };
-       };
-};
diff --git a/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts b/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts
deleted file mode 100644 (file)
index 76b56ea..0000000
+++ /dev/null
@@ -1,415 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include "qcom-apq8064-v2.0.dtsi"
-#include "qcom-apq8064-arrow-sd-600eval-pins.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/mfd/qcom-rpm.h>
-
-/ {
-       model = "Arrow Electronics, APQ8064 SD_600eval";
-       compatible = "arrow,sd_600eval", "qcom,apq8064";
-
-       aliases {
-               serial0 = &gsbi7_serial;
-               serial1 = &gsbi1_serial;
-               i2c0 = &gsbi2_i2c;
-               i2c1 = &gsbi3_i2c;
-               i2c2 = &gsbi4_i2c;
-               i2c3 = &gsbi7_i2c;
-               spi0 = &gsbi5_spi;
-       };
-
-       regulators {
-               compatible = "simple-bus";
-               vph: regulator-fixed@1 {
-                       compatible = "regulator-fixed";
-                       regulator-min-microvolt = <4500000>;
-                       regulator-max-microvolt = <4500000>;
-                       regulator-name = "VPH";
-                       regulator-type = "voltage";
-                       regulator-boot-on;
-               };
-
-               /* on board fixed 3.3v supply */
-               vcc3v3: vcc3v3 {
-                       compatible = "regulator-fixed";
-                       regulator-name = "VCC3V3";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-               };
-
-       };
-
-       hdmi-out {
-               compatible = "hdmi-connector";
-               type = "a";
-
-               port {
-                       hdmi_con: endpoint {
-                               remote-endpoint = <&hdmi_out>;
-                       };
-               };
-       };
-
-       soc {
-               rpm@108000 {
-                       regulators {
-                               vdd_s1-supply = <&vph>;
-                               vdd_s2-supply = <&vph>;
-                               vdd_s3-supply = <&vph>;
-                               vdd_s4-supply = <&vph>;
-                               vdd_s5-supply = <&vph>;
-                               vdd_s6-supply = <&vph>;
-                               vdd_s7-supply = <&vph>;
-                               vdd_l1_l2_l12_l18-supply = <&pm8921_s4>;
-                               vdd_l3_l15_l17-supply = <&vph>;
-                               vdd_l4_l14-supply = <&vph>;
-                               vdd_l5_l8_l16-supply = <&vph>;
-                               vdd_l6_l7-supply = <&vph>;
-                               vdd_l9_l11-supply = <&vph>;
-                               vdd_l10_l22-supply = <&vph>;
-                               vdd_l21_l23_l29-supply = <&vph>;
-                               vdd_l24-supply = <&pm8921_s1>;
-                               vdd_l25-supply = <&pm8921_s1>;
-                               vdd_l26-supply = <&pm8921_s7>;
-                               vdd_l27-supply = <&pm8921_s7>;
-                               vdd_l28-supply = <&pm8921_s7>;
-                               vin_lvs1_3_6-supply = <&pm8921_s4>;
-                               vin_lvs2-supply = <&pm8921_s1>;
-                               vin_lvs4_5_7-supply = <&pm8921_s4>;
-
-                               s1 {
-                                       regulator-always-on;
-                                       regulator-min-microvolt = <1225000>;
-                                       regulator-max-microvolt = <1225000>;
-                                       qcom,switch-mode-frequency = <3200000>;
-                                       bias-pull-down;
-                               };
-
-                               s2 {
-                                       regulator-min-microvolt = <1300000>;
-                                       regulator-max-microvolt = <1300000>;
-                                       qcom,switch-mode-frequency = <1600000>;
-       &nbs