]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'dt-rh/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:16:09 +0000 (13:16 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:16:09 +0000 (13:16 +1100)
206 files changed:
Documentation/devicetree/bindings/arm/tegra/nvidia,nvec.txt [moved from Documentation/devicetree/bindings/nvec/nvidia,nvec.txt with 100% similarity]
Documentation/devicetree/bindings/crypto/fsl-sec4.txt
Documentation/devicetree/bindings/display/arm,pl11x.txt [moved from Documentation/devicetree/bindings/video/arm,pl11x.txt with 100% similarity]
Documentation/devicetree/bindings/display/armada/marvell,dove-lcd.txt [moved from Documentation/devicetree/bindings/drm/armada/marvell,dove-lcd.txt with 100% similarity]
Documentation/devicetree/bindings/display/atmel,lcdc.txt [moved from Documentation/devicetree/bindings/video/atmel,lcdc.txt with 100% similarity]
Documentation/devicetree/bindings/display/atmel/hlcdc-dc.txt [moved from Documentation/devicetree/bindings/drm/atmel/hlcdc-dc.txt with 100% similarity]
Documentation/devicetree/bindings/display/bridge/adi,adv7123.txt [moved from Documentation/devicetree/bindings/video/adi,adv7123.txt with 100% similarity]
Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt [moved from Documentation/devicetree/bindings/video/adi,adv7511.txt with 100% similarity]
Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt [moved from Documentation/devicetree/bindings/drm/bridge/dw_hdmi.txt with 91% similarity]
Documentation/devicetree/bindings/display/bridge/ps8622.txt [moved from Documentation/devicetree/bindings/video/bridge/ps8622.txt with 100% similarity]
Documentation/devicetree/bindings/display/bridge/ptn3460.txt [moved from Documentation/devicetree/bindings/video/bridge/ptn3460.txt with 100% similarity]
Documentation/devicetree/bindings/display/bridge/tda998x.txt [moved from Documentation/devicetree/bindings/drm/i2c/tda998x.txt with 100% similarity]
Documentation/devicetree/bindings/display/bridge/thine,thc63lvdm83d.txt [moved from Documentation/devicetree/bindings/video/thine,thc63lvdm83d with 100% similarity]
Documentation/devicetree/bindings/display/cirrus,clps711x-fb.txt [moved from Documentation/devicetree/bindings/video/cirrus,clps711x-fb.txt with 94% similarity]
Documentation/devicetree/bindings/display/connector/analog-tv-connector.txt [moved from Documentation/devicetree/bindings/video/analog-tv-connector.txt with 100% similarity]
Documentation/devicetree/bindings/display/connector/dvi-connector.txt [moved from Documentation/devicetree/bindings/video/dvi-connector.txt with 100% similarity]
Documentation/devicetree/bindings/display/connector/hdmi-connector.txt [moved from Documentation/devicetree/bindings/video/hdmi-connector.txt with 100% similarity]
Documentation/devicetree/bindings/display/connector/vga-connector.txt [moved from Documentation/devicetree/bindings/video/vga-connector.txt with 100% similarity]
Documentation/devicetree/bindings/display/exynos/exynos-mic.txt [moved from Documentation/devicetree/bindings/video/exynos-mic.txt with 100% similarity]
Documentation/devicetree/bindings/display/exynos/exynos5433-decon.txt [moved from Documentation/devicetree/bindings/video/exynos5433-decon.txt with 100% similarity]
Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt [moved from Documentation/devicetree/bindings/video/exynos7-decon.txt with 97% similarity]
Documentation/devicetree/bindings/display/exynos/exynos_dp.txt [moved from Documentation/devicetree/bindings/video/exynos_dp.txt with 98% similarity]
Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt [moved from Documentation/devicetree/bindings/video/exynos_dsim.txt with 98% similarity]
Documentation/devicetree/bindings/display/exynos/exynos_hdmi.txt [moved from Documentation/devicetree/bindings/video/exynos_hdmi.txt with 100% similarity]
Documentation/devicetree/bindings/display/exynos/exynos_hdmiddc.txt [moved from Documentation/devicetree/bindings/video/exynos_hdmiddc.txt with 100% similarity]
Documentation/devicetree/bindings/display/exynos/exynos_hdmiphy.txt [moved from Documentation/devicetree/bindings/video/exynos_hdmiphy.txt with 100% similarity]
Documentation/devicetree/bindings/display/exynos/exynos_mixer.txt [moved from Documentation/devicetree/bindings/video/exynos_mixer.txt with 100% similarity]
Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt [moved from Documentation/devicetree/bindings/video/samsung-fimd.txt with 98% similarity]
Documentation/devicetree/bindings/display/fsl,dcu.txt [moved from Documentation/devicetree/bindings/video/fsl,dcu.txt with 100% similarity]
Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt [moved from Documentation/devicetree/bindings/video/fsl,imx-fb.txt with 96% similarity]
Documentation/devicetree/bindings/display/imx/fsl-imx-drm.txt [moved from Documentation/devicetree/bindings/drm/imx/fsl-imx-drm.txt with 100% similarity]
Documentation/devicetree/bindings/display/imx/hdmi.txt [moved from Documentation/devicetree/bindings/drm/imx/hdmi.txt with 100% similarity]
Documentation/devicetree/bindings/display/imx/ldb.txt [moved from Documentation/devicetree/bindings/drm/imx/ldb.txt with 98% similarity]
Documentation/devicetree/bindings/display/marvell,pxa2xx-lcdc.txt [new file with mode: 0644]
Documentation/devicetree/bindings/display/mipi-dsi-bus.txt [moved from Documentation/devicetree/bindings/mipi/dsi/mipi-dsi-bus.txt with 100% similarity]
Documentation/devicetree/bindings/display/msm/dsi.txt [moved from Documentation/devicetree/bindings/drm/msm/dsi.txt with 98% similarity]
Documentation/devicetree/bindings/display/msm/edp.txt [moved from Documentation/devicetree/bindings/drm/msm/edp.txt with 100% similarity]
Documentation/devicetree/bindings/display/msm/gpu.txt [moved from Documentation/devicetree/bindings/drm/msm/gpu.txt with 100% similarity]
Documentation/devicetree/bindings/display/msm/hdmi.txt [moved from Documentation/devicetree/bindings/drm/msm/hdmi.txt with 100% similarity]
Documentation/devicetree/bindings/display/msm/mdp.txt [moved from Documentation/devicetree/bindings/drm/msm/mdp.txt with 100% similarity]
Documentation/devicetree/bindings/display/mxsfb.txt [moved from Documentation/devicetree/bindings/fb/mxsfb.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/ampire,am800480r3tmqwa1h.txt [moved from Documentation/devicetree/bindings/panel/ampire,am800480r3tmqwa1h.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/auo,b080uan01.txt [moved from Documentation/devicetree/bindings/panel/auo,b080uan01.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/auo,b101aw03.txt [moved from Documentation/devicetree/bindings/panel/auo,b101aw03.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/auo,b101ean01.txt [moved from Documentation/devicetree/bindings/panel/auo,b101ean01.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/auo,b101xtn01.txt [moved from Documentation/devicetree/bindings/panel/auo,b101xtn01.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/auo,b116xw03.txt [moved from Documentation/devicetree/bindings/panel/auo,b116xw03.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/auo,b133htn01.txt [moved from Documentation/devicetree/bindings/panel/auo,b133htn01.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/auo,b133xtn01.txt [moved from Documentation/devicetree/bindings/panel/auo,b133xtn01.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/avic,tm070ddh03.txt [moved from Documentation/devicetree/bindings/panel/avic,tm070ddh03.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/chunghwa,claa101wa01a.txt [moved from Documentation/devicetree/bindings/panel/chunghwa,claa101wa01a.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/chunghwa,claa101wb03.txt [moved from Documentation/devicetree/bindings/panel/chunghwa,claa101wb03.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/display-timing.txt [moved from Documentation/devicetree/bindings/video/display-timing.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/edt,et057090dhu.txt [moved from Documentation/devicetree/bindings/panel/edt,et057090dhu.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/edt,et070080dh6.txt [moved from Documentation/devicetree/bindings/panel/edt,et070080dh6.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/edt,etm0700g0dh6.txt [moved from Documentation/devicetree/bindings/panel/edt,etm0700g0dh6.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/foxlink,fl500wvr00-a0t.txt [moved from Documentation/devicetree/bindings/panel/foxlink,fl500wvr00-a0t.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/giantplus,gpg482739qs5.txt [moved from Documentation/devicetree/bindings/panel/giantplus,gpg482739qs5.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/hannstar,hsd070pww1.txt [moved from Documentation/devicetree/bindings/panel/hannstar,hsd070pww1.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/hannstar,hsd100pxn1.txt [moved from Documentation/devicetree/bindings/panel/hannstar,hsd100pxn1.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/hit,tx23d38vm0caa.txt [moved from Documentation/devicetree/bindings/panel/hit,tx23d38vm0caa.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/innolux,at043tn24.txt [moved from Documentation/devicetree/bindings/panel/innolux,at043tn24.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/innolux,g121i1-l01.txt [moved from Documentation/devicetree/bindings/panel/innolux,g121i1-l01.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/innolux,n116bge.txt [moved from Documentation/devicetree/bindings/panel/innolux,n116bge.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/innolux,n156bge-l21.txt [moved from Documentation/devicetree/bindings/panel/innolux,n156bge-l21.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/innolux,zj070na-01p.txt [moved from Documentation/devicetree/bindings/panel/innolux,zj070na-01p.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/lg,lb070wv8.txt [moved from Documentation/devicetree/bindings/panel/lg,lb070wv8.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/lg,ld070wx3-sl01.txt [moved from Documentation/devicetree/bindings/panel/lg,ld070wx3-sl01.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/lg,lg4573.txt [moved from Documentation/devicetree/bindings/panel/lg,lg4573.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/lg,lh500wx1-sd03.txt [moved from Documentation/devicetree/bindings/panel/lg,lh500wx1-sd03.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/lg,lp129qe.txt [moved from Documentation/devicetree/bindings/panel/lg,lp129qe.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/lgphilips,lb035q02.txt [moved from Documentation/devicetree/bindings/video/lgphilips,lb035q02.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/nec,nl4827hc19-05b.txt [moved from Documentation/devicetree/bindings/panel/nec,nl4827hc19-05b.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/okaya,rs800480t-7x0gp.txt [moved from Documentation/devicetree/bindings/panel/okaya,rs800480t-7x0gp.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/ortustech,com43h4m85ulc.txt [moved from Documentation/devicetree/bindings/panel/ortustech,com43h4m85ulc.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/panasonic,vvx10f004b00.txt [moved from Documentation/devicetree/bindings/panel/panasonic,vvx10f004b00.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/panel-dpi.txt [moved from Documentation/devicetree/bindings/video/panel-dpi.txt with 94% similarity]
Documentation/devicetree/bindings/display/panel/panel-dsi-cm.txt [moved from Documentation/devicetree/bindings/video/panel-dsi-cm.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/samsung,ld9040.txt [moved from Documentation/devicetree/bindings/panel/samsung,ld9040.txt with 96% similarity]
Documentation/devicetree/bindings/display/panel/samsung,ltn101nt05.txt [moved from Documentation/devicetree/bindings/panel/samsung,ltn101nt05.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/samsung,ltn140at29-301.txt [moved from Documentation/devicetree/bindings/panel/samsung,ltn140at29-301.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/samsung,s6e8aa0.txt [moved from Documentation/devicetree/bindings/panel/samsung,s6e8aa0.txt with 95% similarity]
Documentation/devicetree/bindings/display/panel/sharp,lq101r1sx01.txt [moved from Documentation/devicetree/bindings/panel/sharp,lq101r1sx01.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/sharp,ls037v7dw01.txt [moved from Documentation/devicetree/bindings/video/sharp,ls037v7dw01.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/shelly,sca07010-bfn-lnn.txt [moved from Documentation/devicetree/bindings/panel/shelly,sca07010-bfn-lnn.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/simple-panel.txt [moved from Documentation/devicetree/bindings/panel/simple-panel.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/sony,acx565akm.txt [moved from Documentation/devicetree/bindings/video/sony,acx565akm.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/toppoly,td028ttec1.txt [moved from Documentation/devicetree/bindings/video/toppoly,td028ttec1.txt with 100% similarity]
Documentation/devicetree/bindings/display/panel/tpo,td043mtea1.txt [moved from Documentation/devicetree/bindings/video/tpo,td043mtea1.txt with 100% similarity]
Documentation/devicetree/bindings/display/renesas,du.txt [moved from Documentation/devicetree/bindings/video/renesas,du.txt with 100% similarity]
Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt [moved from Documentation/devicetree/bindings/video/dw_hdmi-rockchip.txt with 100% similarity]
Documentation/devicetree/bindings/display/rockchip/rockchip-drm.txt [moved from Documentation/devicetree/bindings/video/rockchip-drm.txt with 88% similarity]
Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt [moved from Documentation/devicetree/bindings/video/rockchip-vop.txt with 100% similarity]
Documentation/devicetree/bindings/display/simple-framebuffer-sunxi.txt [moved from Documentation/devicetree/bindings/video/simple-framebuffer-sunxi.txt with 100% similarity]
Documentation/devicetree/bindings/display/simple-framebuffer.txt [moved from Documentation/devicetree/bindings/video/simple-framebuffer.txt with 100% similarity]
Documentation/devicetree/bindings/display/sm501fb.txt [moved from Documentation/devicetree/bindings/fb/sm501fb.txt with 100% similarity]
Documentation/devicetree/bindings/display/ssd1289fb.txt [moved from Documentation/devicetree/bindings/video/ssd1289fb.txt with 100% similarity]
Documentation/devicetree/bindings/display/ssd1307fb.txt [moved from Documentation/devicetree/bindings/video/ssd1307fb.txt with 100% similarity]
Documentation/devicetree/bindings/display/st,stih4xx.txt [moved from Documentation/devicetree/bindings/gpu/st,stih4xx.txt with 98% similarity]
Documentation/devicetree/bindings/display/tegra/nvidia,tegra114-mipi.txt [moved from Documentation/devicetree/bindings/mipi/nvidia,tegra114-mipi.txt with 100% similarity]
Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt [moved from Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt with 99% similarity]
Documentation/devicetree/bindings/display/ti/ti,dra7-dss.txt [moved from Documentation/devicetree/bindings/video/ti,dra7-dss.txt with 95% similarity]
Documentation/devicetree/bindings/display/ti/ti,omap-dss.txt [moved from Documentation/devicetree/bindings/video/ti,omap-dss.txt with 100% similarity]
Documentation/devicetree/bindings/display/ti/ti,omap2-dss.txt [moved from Documentation/devicetree/bindings/video/ti,omap2-dss.txt with 93% similarity]
Documentation/devicetree/bindings/display/ti/ti,omap3-dss.txt [moved from Documentation/devicetree/bindings/video/ti,omap3-dss.txt with 95% similarity]
Documentation/devicetree/bindings/display/ti/ti,omap4-dss.txt [moved from Documentation/devicetree/bindings/video/ti,omap4-dss.txt with 97% similarity]
Documentation/devicetree/bindings/display/ti/ti,omap5-dss.txt [moved from Documentation/devicetree/bindings/video/ti,omap5-dss.txt with 96% similarity]
Documentation/devicetree/bindings/display/ti/ti,opa362.txt [moved from Documentation/devicetree/bindings/video/ti,opa362.txt with 100% similarity]
Documentation/devicetree/bindings/display/ti/ti,tfp410.txt [moved from Documentation/devicetree/bindings/video/ti,tfp410.txt with 100% similarity]
Documentation/devicetree/bindings/display/ti/ti,tpd12s015.txt [moved from Documentation/devicetree/bindings/video/ti,tpd12s015.txt with 100% similarity]
Documentation/devicetree/bindings/display/tilcdc/panel.txt [moved from Documentation/devicetree/bindings/drm/tilcdc/panel.txt with 96% similarity]
Documentation/devicetree/bindings/display/tilcdc/tfp410.txt [moved from Documentation/devicetree/bindings/drm/tilcdc/tfp410.txt with 100% similarity]
Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt [moved from Documentation/devicetree/bindings/drm/tilcdc/tilcdc.txt with 100% similarity]
Documentation/devicetree/bindings/display/via,vt8500-fb.txt [moved from Documentation/devicetree/bindings/video/via,vt8500-fb.txt with 100% similarity]
Documentation/devicetree/bindings/display/wm,prizm-ge-rops.txt [moved from Documentation/devicetree/bindings/video/wm,prizm-ge-rops.txt with 100% similarity]
Documentation/devicetree/bindings/display/wm,wm8505-fb.txt [moved from Documentation/devicetree/bindings/video/wm,wm8505-fb.txt with 100% similarity]
Documentation/devicetree/bindings/eeprom/at25.txt [moved from Documentation/devicetree/bindings/misc/at25.txt with 100% similarity]
Documentation/devicetree/bindings/eeprom/eeprom.txt [moved from Documentation/devicetree/bindings/eeprom.txt with 100% similarity]
Documentation/devicetree/bindings/fpga/altera-socfpga-fpga-mgr.txt
Documentation/devicetree/bindings/hwmon/ina209.txt [deleted file]
Documentation/devicetree/bindings/hwmon/ina2xx.txt
Documentation/devicetree/bindings/iio/accel/lis302.txt [moved from Documentation/devicetree/bindings/misc/lis302.txt with 100% similarity]
Documentation/devicetree/bindings/iio/dac/ti,dac7512.txt [moved from Documentation/devicetree/bindings/misc/ti,dac7512.txt with 100% similarity]
Documentation/devicetree/bindings/iio/pressure/bmp085.txt [moved from Documentation/devicetree/bindings/misc/bmp085.txt with 100% similarity]
Documentation/devicetree/bindings/input/ads7846.txt
Documentation/devicetree/bindings/input/gpio-keys-polled.txt
Documentation/devicetree/bindings/input/gpio-keys.txt
Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt
Documentation/devicetree/bindings/input/hid-over-i2c.txt [moved from Documentation/devicetree/bindings/hid/hid-over-i2c.txt with 100% similarity]
Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt
Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt
Documentation/devicetree/bindings/input/samsung-keypad.txt
Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt [moved from Documentation/devicetree/bindings/arm/gic-v3.txt with 100% similarity]
Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt [moved from Documentation/devicetree/bindings/arm/gic.txt with 100% similarity]
Documentation/devicetree/bindings/interrupt-controller/arm,versatile-fpga-irq.txt [moved from Documentation/devicetree/bindings/arm/versatile-fpga-irq.txt with 100% similarity]
Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt [moved from Documentation/devicetree/bindings/arm/vic.txt with 100% similarity]
Documentation/devicetree/bindings/interrupt-controller/axis,crisv32-intc.txt [moved from Documentation/devicetree/bindings/cris/interrupts.txt with 100% similarity]
Documentation/devicetree/bindings/interrupt-controller/img,meta-intc.txt [moved from Documentation/devicetree/bindings/metag/meta-intc.txt with 100% similarity]
Documentation/devicetree/bindings/interrupt-controller/img,pdc-intc.txt [moved from Documentation/devicetree/bindings/metag/pdc-intc.txt with 100% similarity]
Documentation/devicetree/bindings/interrupt-controller/intel,ce4100-ioapic.txt [moved from Documentation/devicetree/bindings/x86/interrupt.txt with 100% similarity]
Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt [moved from Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt with 100% similarity]
Documentation/devicetree/bindings/interrupt-controller/mrvl,intc.txt [moved from Documentation/devicetree/bindings/arm/mrvl/intc.txt with 100% similarity]
Documentation/devicetree/bindings/interrupt-controller/nxp,lpc3220-mic.txt [moved from Documentation/devicetree/bindings/arm/lpc32xx-mic.txt with 100% similarity]
Documentation/devicetree/bindings/interrupt-controller/open-pic.txt [moved from Documentation/devicetree/bindings/open-pic.txt with 100% similarity]
Documentation/devicetree/bindings/interrupt-controller/samsung,exynos4210-combiner.txt [moved from Documentation/devicetree/bindings/arm/samsung/interrupt-combiner.txt with 100% similarity]
Documentation/devicetree/bindings/interrupt-controller/snps,arc700-intc.txt [moved from Documentation/devicetree/bindings/arc/interrupts.txt with 100% similarity]
Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt [moved from Documentation/devicetree/bindings/arc/archs-idu-intc.txt with 100% similarity]
Documentation/devicetree/bindings/interrupt-controller/snps,archs-intc.txt [moved from Documentation/devicetree/bindings/arc/archs-intc.txt with 100% similarity]
Documentation/devicetree/bindings/interrupt-controller/st,spear3xx-shirq.txt [moved from Documentation/devicetree/bindings/arm/spear/shirq.txt with 100% similarity]
Documentation/devicetree/bindings/interrupt-controller/ti,c64x+megamod-pic.txt [moved from Documentation/devicetree/bindings/c6x/interrupt.txt with 100% similarity]
Documentation/devicetree/bindings/interrupt-controller/ti,cp-intc.txt [moved from Documentation/devicetree/bindings/arm/davinci/cp-intc.txt with 100% similarity]
Documentation/devicetree/bindings/interrupt-controller/ti,omap2-intc.txt [moved from Documentation/devicetree/bindings/arm/omap/intc.txt with 100% similarity]
Documentation/devicetree/bindings/interrupt-controller/via,vt8500-intc.txt [moved from Documentation/devicetree/bindings/arm/vt8500/via,vt8500-intc.txt with 100% similarity]
Documentation/devicetree/bindings/leds/backlight/88pm860x.txt [moved from Documentation/devicetree/bindings/video/backlight/88pm860x.txt with 100% similarity]
Documentation/devicetree/bindings/leds/backlight/gpio-backlight.txt [moved from Documentation/devicetree/bindings/video/backlight/gpio-backlight.txt with 100% similarity]
Documentation/devicetree/bindings/leds/backlight/lp855x.txt [moved from Documentation/devicetree/bindings/video/backlight/lp855x.txt with 100% similarity]
Documentation/devicetree/bindings/leds/backlight/max8925-backlight.txt [moved from Documentation/devicetree/bindings/video/backlight/max8925-backlight.txt with 100% similarity]
Documentation/devicetree/bindings/leds/backlight/pm8941-wled.txt [moved from Documentation/devicetree/bindings/video/backlight/pm8941-wled.txt with 100% similarity]
Documentation/devicetree/bindings/leds/backlight/pwm-backlight.txt [moved from Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt with 100% similarity]
Documentation/devicetree/bindings/leds/backlight/sky81452-backlight.txt [moved from Documentation/devicetree/bindings/video/backlight/sky81452-backlight.txt with 100% similarity]
Documentation/devicetree/bindings/leds/backlight/tps65217-backlight.txt [moved from Documentation/devicetree/bindings/video/backlight/tps65217-backlight.txt with 100% similarity]
Documentation/devicetree/bindings/memory-controllers/calxeda-ddr-ctrlr.txt [moved from Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt with 100% similarity]
Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt
Documentation/devicetree/bindings/mfd/sky81452.txt
Documentation/devicetree/bindings/mfd/tc3589x.txt
Documentation/devicetree/bindings/mmc/mmc.txt
Documentation/devicetree/bindings/pci/pci.txt
Documentation/devicetree/bindings/phy/calxeda-combophy.txt [moved from Documentation/devicetree/bindings/arm/calxeda/combophy.txt with 100% similarity]
Documentation/devicetree/bindings/phy/keystone-usb-phy.txt [moved from Documentation/devicetree/bindings/usb/keystone-phy.txt with 100% similarity]
Documentation/devicetree/bindings/phy/mxs-usb-phy.txt [moved from Documentation/devicetree/bindings/usb/mxs-phy.txt with 100% similarity]
Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.txt [moved from Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt with 100% similarity]
Documentation/devicetree/bindings/phy/qcom,usb-8x16-phy.txt [moved from Documentation/devicetree/bindings/usb/qcom,usb-8x16-phy.txt with 100% similarity]
Documentation/devicetree/bindings/power/wakeup-source.txt [new file with mode: 0644]
Documentation/devicetree/bindings/rng/atmel-trng.txt [moved from Documentation/devicetree/bindings/hwrng/atmel-trng.txt with 100% similarity]
Documentation/devicetree/bindings/rng/brcm,iproc-rng200.txt [moved from Documentation/devicetree/bindings/hwrng/brcm,iproc-rng200.txt with 100% similarity]
Documentation/devicetree/bindings/rng/omap_rng.txt [moved from Documentation/devicetree/bindings/hwrng/omap_rng.txt with 100% similarity]
Documentation/devicetree/bindings/rng/timeriomem_rng.txt [moved from Documentation/devicetree/bindings/hwrng/timeriomem_rng.txt with 100% similarity]
Documentation/devicetree/bindings/rtc/isil,isl12057.txt
Documentation/devicetree/bindings/rtc/rtc-opal.txt
Documentation/devicetree/bindings/serial/mrvl,pxa-ssp.txt
Documentation/devicetree/bindings/serial/pl011.txt
Documentation/devicetree/bindings/usb/samsung-usbphy.txt [deleted file]
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/arc/Makefile
arch/arc/boot/dts/Makefile
arch/arm/boot/dts/Makefile
arch/arm64/boot/dts/Makefile
arch/h8300/boot/dts/Makefile
arch/metag/Makefile
arch/metag/boot/dts/Makefile
arch/mips/boot/dts/Makefile
arch/xtensa/Makefile
arch/xtensa/boot/dts/Makefile
drivers/base/core.c
drivers/of/Kconfig
drivers/of/address.c
drivers/of/base.c
drivers/of/device.c
drivers/of/fdt.c
drivers/of/irq.c
drivers/of/of_pci.c
drivers/of/of_reserved_mem.c
drivers/of/overlay.c
drivers/of/platform.c
drivers/of/unittest.c
include/linux/of_irq.h

index 6831d025ec24403668bbe0644d76e3c8c8c2b636..adeca34c5a33b4ddade769ba9e7dd79e184c9a11 100644 (file)
@@ -441,7 +441,7 @@ EXAMPLE:
                regmap = <&snvs>;
                interrupts = <0 4 0x4>
                linux,keycode = <116>; /* KEY_POWER */
-               wakeup;
+               wakeup-source;
        };
 
 =====================================================================
@@ -530,7 +530,7 @@ FULL EXAMPLE
                        regmap = <&sec_mon>;
                        interrupts = <0 4 0x4>;
                        linux,keycode = <116>; /* KEY_POWER */
-                       wakeup;
+                       wakeup-source;
                };
        };
 
similarity index 91%
rename from Documentation/devicetree/bindings/drm/bridge/dw_hdmi.txt
rename to Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt
index a905c1413558d38479885eb1fbc225639ac22f58..dc1452f0d5d81a7cc931cb52fbe89b6f5751e706 100644 (file)
@@ -14,8 +14,8 @@ Required properties:
 -port@[X]: SoC specific port nodes with endpoint definitions as defined
    in Documentation/devicetree/bindings/media/video-interfaces.txt,
    please refer to the SoC specific binding document:
-    * Documentation/devicetree/bindings/drm/imx/hdmi.txt
-    * Documentation/devicetree/bindings/video/dw_hdmi-rockchip.txt
+    * Documentation/devicetree/bindings/display/imx/hdmi.txt
+    * Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt
 
 Optional properties
 - reg-io-width: the width of the reg:1,4, default set to 1 if not present
similarity index 94%
rename from Documentation/devicetree/bindings/video/cirrus,clps711x-fb.txt
rename to Documentation/devicetree/bindings/display/cirrus,clps711x-fb.txt
index 6fc3c6adeefae797daaddc6b74c26a7e9eca7247..d685be898d0ca6a001856383f61c83aec5b8d242 100644 (file)
@@ -6,7 +6,7 @@ Required properties:
               location and size of the framebuffer memory.
 - clocks    : phandle + clock specifier pair of the FB reference clock.
 - display   : phandle to a display node as described in
-              Documentation/devicetree/bindings/video/display-timing.txt.
+              Documentation/devicetree/bindings/display/display-timing.txt.
               Additionally, the display node has to define properties:
   - bits-per-pixel: Bits per pixel.
   - ac-prescale   : LCD AC bias frequency. This frequency is the required
similarity index 97%
rename from Documentation/devicetree/bindings/video/exynos7-decon.txt
rename to Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt
index f5f9c8d4a55a8d48899eb944dd82282df49c2298..3938caacf11c8281ec1777657c4df3576f57bd77 100644 (file)
@@ -38,7 +38,7 @@ Optional Properties:
                Can be used in case timings cannot be provided otherwise
                or to override timings provided by the panel.
 
-[1]: Documentation/devicetree/bindings/video/display-timing.txt
+[1]: Documentation/devicetree/bindings/display/display-timing.txt
 
 Example:
 
similarity index 98%
rename from Documentation/devicetree/bindings/video/exynos_dp.txt
rename to Documentation/devicetree/bindings/display/exynos/exynos_dp.txt
index 7a3a9cdb86ab2877c3f5df402fc1ea0a5d64f01c..64693f2ebc51fa080113e86bc523e71d6c2dfa21 100644 (file)
@@ -50,7 +50,7 @@ Required properties for dp-controller:
                number of lanes supported by the panel.
                        LANE_COUNT1 = 1, LANE_COUNT2 = 2, LANE_COUNT4 = 4
        - display-timings: timings for the connected panel as described by
-               Documentation/devicetree/bindings/video/display-timing.txt
+               Documentation/devicetree/bindings/display/display-timing.txt
 
 Optional properties for dp-controller:
        -interlaced:
similarity index 98%
rename from Documentation/devicetree/bindings/video/exynos_dsim.txt
rename to Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt
index 0be0362706611f9bbe5d97183291588be3825697..0e6f0c02485878ecf60a3b9b73ecb09417d8ab4d 100644 (file)
@@ -49,7 +49,7 @@ Video interfaces:
       mode
     - samsung,esc-clock-frequency: specifies DSI frequency in escape mode
 
-[1]: Documentation/devicetree/bindings/mipi/dsi/mipi-dsi-bus.txt
+[1]: Documentation/devicetree/bindings/display/mipi-dsi-bus.txt
 [2]: Documentation/devicetree/bindings/media/video-interfaces.txt
 
 Example:
similarity index 98%
rename from Documentation/devicetree/bindings/video/samsung-fimd.txt
rename to Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt
index a8bbbde03e79e49952c91851f94d37bc1591abee..27c3ce0db16a3c43a525b55a03d3869cc5edcb07 100644 (file)
@@ -82,7 +82,7 @@ in [2]. The following are properties specific to those nodes:
                3 - for parallel output,
                4 - for write-back interface
 
-[1]: Documentation/devicetree/bindings/video/display-timing.txt
+[1]: Documentation/devicetree/bindings/display/display-timing.txt
 [2]: Documentation/devicetree/bindings/media/video-interfaces.txt
 
 Example:
similarity index 96%
rename from Documentation/devicetree/bindings/video/fsl,imx-fb.txt
rename to Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt
index 8c8c2f4e4c3fe3de0790b99a27643480a3ee4158..00d5f8ea7ec631627bfda387297d62b0f8cf1138 100644 (file)
@@ -9,7 +9,7 @@ Required properties:
 
 Required nodes:
 - display: Phandle to a display node as described in
-       Documentation/devicetree/bindings/video/display-timing.txt
+       Documentation/devicetree/bindings/display/display-timing.txt
        Additional, the display node has to define properties:
        - bits-per-pixel: Bits per pixel
        - fsl,pcr: LCDC PCR value
similarity index 98%
rename from Documentation/devicetree/bindings/drm/imx/ldb.txt
rename to Documentation/devicetree/bindings/display/imx/ldb.txt
index 9a21366436f6de14f862bed9ee71bb054e7b03d4..0a175d991b52b26a5c81d9166329558713e45406 100644 (file)
@@ -63,7 +63,7 @@ Required properties:
 
 Optional properties (required if display-timings are used):
  - display-timings : A node that describes the display timings as defined in
-   Documentation/devicetree/bindings/video/display-timing.txt.
+   Documentation/devicetree/bindings/display/display-timing.txt.
  - fsl,data-mapping : should be "spwg" or "jeida"
                       This describes how the color bits are laid out in the
                       serialized LVDS signal.
diff --git a/Documentation/devicetree/bindings/display/marvell,pxa2xx-lcdc.txt b/Documentation/devicetree/bindings/display/marvell,pxa2xx-lcdc.txt
new file mode 100644 (file)
index 0000000..309c47f
--- /dev/null
@@ -0,0 +1,34 @@
+PXA LCD Controller
+------------------
+
+Required properties:
+ - compatible : one of these
+       "marvell,pxa2xx-lcdc",
+       "marvell,pxa270-lcdc",
+       "marvell,pxa300-lcdc"
+ - reg : should contain 1 register range (address and length).
+ - interrupts : framebuffer controller interrupt.
+ - clocks: phandle to input clocks
+
+Required nodes:
+ - port: connection to the LCD panel (see video-interfaces.txt)
+        This node must have its properties bus-width and remote-endpoint set.
+        If the panel is not a TFT color panel, then a "lcd-type" property in
+        the panel should specify the panel type.
+        This panel node should be in the board dts.
+
+Example:
+       lcd-controller@40500000 {
+               compatible = "marvell,pxa2xx-lcdc";
+               reg = <0x44000000 0x10000>;
+               interrupts = <17>;
+               clocks = <&clks CLK_LCD>;
+               status = "okay";
+
+               port {
+                       lcdc_out: endpoint {
+                               remote-endpoint = <&panel_in>;
+                               bus-width = <16>;
+                       };
+               };
+       };
similarity index 98%
rename from Documentation/devicetree/bindings/drm/msm/dsi.txt
rename to Documentation/devicetree/bindings/display/msm/dsi.txt
index d56923cd55902fb789426fc62737a1627b2ceed8..f344b9e49198829617c9c3462f068595a1e0794f 100644 (file)
@@ -28,7 +28,7 @@ Required properties:
 
 Optional properties:
 - panel@0: Node of panel connected to this DSI controller.
-  See files in Documentation/devicetree/bindings/panel/ for each supported
+  See files in Documentation/devicetree/bindings/display/panel/ for each supported
   panel.
 - qcom,dual-dsi-mode: Boolean value indicating if the DSI controller is
   driving a panel which needs 2 DSI links.
similarity index 94%
rename from Documentation/devicetree/bindings/video/panel-dpi.txt
rename to Documentation/devicetree/bindings/display/panel/panel-dpi.txt
index a40180b05bab1ff6ea3f78503f5f4b76561534fa..216c894d4f99514d606151aabe152ec5014837b4 100644 (file)
@@ -10,7 +10,7 @@ Optional properties:
 
 Required nodes:
 - "panel-timing" containing video timings
-  (Documentation/devicetree/bindings/video/display-timing.txt)
+  (Documentation/devicetree/bindings/display/display-timing.txt)
 - Video port for DPI input
 
 Example
similarity index 96%
rename from Documentation/devicetree/bindings/panel/samsung,ld9040.txt
rename to Documentation/devicetree/bindings/display/panel/samsung,ld9040.txt
index 07c36c3f7b52ad2be22a9c80303593ac64546e37..fc595d9b985bbfd3c37ed8d32b193d1812c7d142 100644 (file)
@@ -20,7 +20,7 @@ The device node can contain one 'port' child node with one child
 'endpoint' node, according to the bindings defined in [3]. This
 node should describe panel's video bus.
 
-[1]: Documentation/devicetree/bindings/video/display-timing.txt
+[1]: Documentation/devicetree/bindings/display/display-timing.txt
 [2]: Documentation/devicetree/bindings/spi/spi-bus.txt
 [3]: Documentation/devicetree/bindings/media/video-interfaces.txt
 
similarity index 95%
rename from Documentation/devicetree/bindings/panel/samsung,s6e8aa0.txt
rename to Documentation/devicetree/bindings/display/panel/samsung,s6e8aa0.txt
index e7ee988e315615c6d09ea138e0ffeec8db0a67c4..25701c81b5e0f045673dd55e672298bbff47afcb 100644 (file)
@@ -21,7 +21,7 @@ The device node can contain one 'port' child node with one child
 'endpoint' node, according to the bindings defined in [2]. This
 node should describe panel's video bus.
 
-[1]: Documentation/devicetree/bindings/video/display-timing.txt
+[1]: Documentation/devicetree/bindings/display/display-timing.txt
 [2]: Documentation/devicetree/bindings/media/video-interfaces.txt
 
 Example:
similarity index 88%
rename from Documentation/devicetree/bindings/video/rockchip-drm.txt
rename to Documentation/devicetree/bindings/display/rockchip/rockchip-drm.txt
index 7fff582495a228fae7e7c21445320a9d7cf5fb4f..5707af89319da70588c6b2b575cdb390420dd9f6 100644 (file)
@@ -9,7 +9,7 @@ Required properties:
 - compatible: Should be "rockchip,display-subsystem"
 - ports: Should contain a list of phandles pointing to display interface port
   of vop devices. vop definitions as defined in
-  Documentation/devicetree/bindings/video/rockchip-vop.txt
+  Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt
 
 example:
 
similarity index 98%
rename from Documentation/devicetree/bindings/gpu/st,stih4xx.txt
rename to Documentation/devicetree/bindings/display/st,stih4xx.txt
index a36dfce0032e25d056b460f93af099d3d6e45a11..a352ed30cd7025fb9047a519ff76e60ce4095603 100644 (file)
@@ -61,7 +61,7 @@ STMicroelectronics stih4xx platforms
   - reg-names: names of the mapped memory regions listed in regs property in
     the same order.
   - interrupts : HDMI interrupt number to the CPU.
-  - interrupt-names: name of the interrupts listed in interrupts property in
+  - interrupt-names: names of the interrupts listed in interrupts property in
     the same order
   - clocks: from common clock binding: handle hardware IP needed clocks, the
     number of clocks may depend of the SoC type.
@@ -95,7 +95,7 @@ sti-dvo:
   - clock-names: names of the clocks listed in clocks property in the same
     order.
   - pinctrl-0: pin control handle
-  - pinctrl-name: names of the pin control to use
+  - pinctrl-names: names of the pin control states to use
   - sti,panel: phandle of the panel connected to the DVO output
 
 sti-hqvdp:
similarity index 99%
rename from Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
rename to Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt
index e685610d38e26cfa439d986d5f12995593ba1daf..a3bd8c050c4ef2f84fcdc29f9325006af14ff01b 100644 (file)
@@ -184,7 +184,7 @@ of the following host1x client modules:
   - avdd-dsi-supply: phandle of a supply that powers the DSI controller
   - nvidia,mipi-calibrate: Should contain a phandle and a specifier specifying
     which pads are used by this DSI output and need to be calibrated. See also
-    ../mipi/nvidia,tegra114-mipi.txt.
+    ../display/tegra/nvidia,tegra114-mipi.txt.
 
   Optional properties:
   - nvidia,ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing
similarity index 95%
rename from Documentation/devicetree/bindings/video/ti,dra7-dss.txt
rename to Documentation/devicetree/bindings/display/ti/ti,dra7-dss.txt
index f33a05137b0eb242de951d4a202d0a15fb8e18bd..c30f9ec189ed612cf1ab79de9e7a4ea4c427f1b8 100644 (file)
@@ -1,7 +1,7 @@
 Texas Instruments DRA7x Display Subsystem
 =========================================
 
-See Documentation/devicetree/bindings/video/ti,omap-dss.txt for generic
+See Documentation/devicetree/bindings/display/ti/ti,omap-dss.txt for generic
 description about OMAP Display Subsystem bindings.
 
 DSS Core
similarity index 93%
rename from Documentation/devicetree/bindings/video/ti,omap2-dss.txt
rename to Documentation/devicetree/bindings/display/ti/ti,omap2-dss.txt
index fa8bb2ed117083a5e5abdc3a393b4c7d292d2f64..afcd5a86c6a45a8a1d9bac21e566ad93a47f95c2 100644 (file)
@@ -1,7 +1,7 @@
 Texas Instruments OMAP2 Display Subsystem
 =========================================
 
-See Documentation/devicetree/bindings/video/ti,omap-dss.txt for generic
+See Documentation/devicetree/bindings/display/ti/ti,omap-dss.txt for generic
 description about OMAP Display Subsystem bindings.
 
 DSS Core
similarity index 95%
rename from Documentation/devicetree/bindings/video/ti,omap3-dss.txt
rename to Documentation/devicetree/bindings/display/ti/ti,omap3-dss.txt
index 0023fa4b13288fbbe431ce1c8c78eaf00f083141..dc66e1447c318139b333b4d5338b5090b0fffa5b 100644 (file)
@@ -1,7 +1,7 @@
 Texas Instruments OMAP3 Display Subsystem
 =========================================
 
-See Documentation/devicetree/bindings/video/ti,omap-dss.txt for generic
+See Documentation/devicetree/bindings/display/ti/ti,omap-dss.txt for generic
 description about OMAP Display Subsystem bindings.
 
 DSS Core
similarity index 97%
rename from Documentation/devicetree/bindings/video/ti,omap4-dss.txt
rename to Documentation/devicetree/bindings/display/ti/ti,omap4-dss.txt
index b8c29fbd1fbb47c82dfc7b884db514cf8107a8ae..bc624db8888d761e814ff1df5fa4d36a6a23ae13 100644 (file)
@@ -1,7 +1,7 @@
 Texas Instruments OMAP4 Display Subsystem
 =========================================
 
-See Documentation/devicetree/bindings/video/ti,omap-dss.txt for generic
+See Documentation/devicetree/bindings/display/ti/ti,omap-dss.txt for generic
 description about OMAP Display Subsystem bindings.
 
 DSS Core
similarity index 96%
rename from Documentation/devicetree/bindings/video/ti,omap5-dss.txt
rename to Documentation/devicetree/bindings/display/ti/ti,omap5-dss.txt
index 38ffc8fcd8169b74d43b13e76aeb5e52443b559c..118a486c47bb71740511a87e661446a7df299580 100644 (file)
@@ -1,7 +1,7 @@
 Texas Instruments OMAP5 Display Subsystem
 =========================================
 
-See Documentation/devicetree/bindings/video/ti,omap-dss.txt for generic
+See Documentation/devicetree/bindings/display/ti/ti,omap-dss.txt for generic
 description about OMAP Display Subsystem bindings.
 
 DSS Core
similarity index 96%
rename from Documentation/devicetree/bindings/drm/tilcdc/panel.txt
rename to Documentation/devicetree/bindings/display/tilcdc/panel.txt
index 4ab9e230090793b4fc11519ed00494f9fad93e1b..f20b31cdc59a4a4c81216db646e61e0d7a21d884 100644 (file)
@@ -15,7 +15,7 @@ Required properties:
  - display-timings: typical videomode of lcd panel.  Multiple video modes
    can be listed if the panel supports multiple timings, but the 'native-mode'
    should be the preferred/default resolution.  Refer to
-   Documentation/devicetree/bindings/video/display-timing.txt for display
+   Documentation/devicetree/bindings/display/display-timing.txt for display
    timing binding details.
 
 Optional properties:
index 9b027a615486a9d1560bb72cbc4662a512e33815..d52f3340414d056ea2e813249ec0eb908eca8c8d 100644 (file)
@@ -9,7 +9,7 @@ Required properties:
 
 Example:
 
-       hps_0_fpgamgr: fpgamgr@0xff706000 {
+       hps_0_fpgamgr: fpgamgr@ff706000 {
                compatible = "altr,socfpga-fpga-mgr";
                reg = <0xFF706000 0x1000
                       0xFFB90000 0x1000>;
diff --git a/Documentation/devicetree/bindings/hwmon/ina209.txt b/Documentation/devicetree/bindings/hwmon/ina209.txt
deleted file mode 100644 (file)
index 9dd2bee..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-ina209 properties
-
-Required properties:
-- compatible: Must be "ti,ina209"
-- reg: I2C address
-
-Optional properties:
-
-- shunt-resistor
-       Shunt resistor value in micro-Ohm
-
-Example:
-
-temp-sensor@4c {
-       compatible = "ti,ina209";
-       reg = <0x4c>;
-       shunt-resistor = <5000>;
-};
index a2ad85d7e74786230dff2c94c03d4417e54abf7a..9bcd5e87830d23882fa930c3b5214a94252f7957 100644 (file)
@@ -2,6 +2,7 @@ ina2xx properties
 
 Required properties:
 - compatible: Must be one of the following:
+       - "ti,ina209" for ina209
        - "ti,ina219" for ina219
        - "ti,ina220" for ina220
        - "ti,ina226" for ina226
index df8b1279491d1ffd34e41cc41088f918511400de..33a1638b61d6bb950b45f0b14ceccaf7ff58eb19 100644 (file)
@@ -65,6 +65,7 @@ Optional properties:
        pendown-gpio                    GPIO handle describing the pin the !PENIRQ
                                        line is connected to.
        wakeup-source                   use any event on touchscreen as wakeup event.
+                                       (Legacy property support: "linux,wakeup")
 
 
 Example for a TSC2046 chip connected to an McSPI controller of an OMAP SoC::
@@ -86,6 +87,6 @@ Example for a TSC2046 chip connected to an McSPI controller of an OMAP SoC::
                        ti,x-plate-ohms = /bits/ 16 <40>;
                        ti,pressure-max = /bits/ 16 <255>;
 
-                       linux,wakeup;
+                       wakeup-source;
                };
        };
index 97e2467181e94a608cb0e04846fb891b67a5d490..95d0fb11a78753cdd272015e876bff704db1d726 100644 (file)
@@ -28,6 +28,7 @@ Optional subnode-properties:
        - debounce-interval: Debouncing interval time in milliseconds.
          If not specified defaults to 5.
        - wakeup-source: Boolean, button can wake-up the system.
+                        (Legacy property supported: "gpio-key,wakeup")
 
 Example nodes:
 
index 072bf7573c376ab3da5ab13d122d4f54d1a4f453..cf1333d1dd52974e4e960a7c97418f86864e56f1 100644 (file)
@@ -24,6 +24,7 @@ Optional subnode-properties:
        - debounce-interval: Debouncing interval time in milliseconds.
          If not specified defaults to 5.
        - wakeup-source: Boolean, button can wake-up the system.
+                        (Legacy property supported: "gpio-key,wakeup")
        - linux,can-disable: Boolean, indicates that button is connected
          to dedicated (not shared) interrupt which can be disabled to
          suppress events from the button.
index 4d86059c370c466a143d87fd6e6b183b5c132fc6..d0ea09ba249fc5ea484625564e81a815abd7f014 100644 (file)
@@ -20,6 +20,7 @@ Required Properties:
 Optional Properties:
 - linux,no-autorepeat: do no enable autorepeat feature.
 - wakeup-source:       use any event on keypad as wakeup event.
+                       (Legacy property supported: "linux,wakeup")
 - debounce-delay-ms:   debounce interval in milliseconds
 - col-scan-delay-us:   delay, measured in microseconds, that is needed
                        before we can scan keypad after activating column gpio
index 0382b8bd69c63b2e821f3a976028384254c81437..1faa7292e21f5de0d2d439d2c554f24082457341 100644 (file)
@@ -29,7 +29,8 @@ matrix-keyboard bindings:
 - nvidia,debounce-delay-ms: delay in milliseconds per row scan for debouncing
 - nvidia,repeat-delay-ms: delay in milliseconds before repeat starts
 - nvidia,ghost-filter: enable ghost filtering for this device
-- nvidia,wakeup-source: configure keyboard as a wakeup source for suspend/resume
+- wakeup-source: configure keyboard as a wakeup source for suspend/resume
+                (Legacy property supported: "nvidia,wakeup-source")
 
 Example:
 
index ee6215681182850d19d255fe7fce85f6bd1461c7..4a9dc6ba96b144b8667fc670524cec594f264b3d 100644 (file)
@@ -37,6 +37,7 @@ PROPERTIES
        Usage: optional
        Value type: <bool>
        Definition: use any event on keypad as wakeup event.
+                   (Legacy property supported: "linux,keypad-wakeup")
 
 - keypad,num-rows:
        Usage: required
index 863e77f619dc6871cbf5dd6792daf38febcdfdaa..5305e74e57425135c069311b0db8671f992cda9e 100644 (file)
@@ -38,6 +38,7 @@ Required Board Specific Properties:
 
 Optional Properties:
 - wakeup-source: use any event on keypad as wakeup event.
+                (Legacy property supported: "linux,input-wakeup")
 
 Optional Properties specific to linux:
 - linux,keypad-no-autorepeat: do no enable autorepeat feature.
@@ -51,7 +52,7 @@ Example:
                samsung,keypad-num-rows = <2>;
                samsung,keypad-num-columns = <8>;
                linux,input-no-autorepeat;
-               linux,input-wakeup;
+               wakeup-source;
 
                pinctrl-names = "default";
                pinctrl-0 = <&keypad_rows &keypad_columns>;
index ad5d90482a0e07d9ae7dd3efde4fa7eef13abcd8..670831b29565369279960e9eddb2e14b4267ccdd 100644 (file)
@@ -15,7 +15,7 @@ Required properties:
 
 The HLCDC IP exposes two subdevices:
  - a PWM chip: see ../pwm/atmel-hlcdc-pwm.txt
- - a Display Controller: see ../drm/atmel-hlcdc-dc.txt
+ - a Display Controller: see ../display/atmel-hlcdc-dc.txt
 
 Example:
 
index 35181794aa241b7f147dd8e0afdffa9db216e602..511764acd4d5f418664c014156788ebf8da06ec6 100644 (file)
@@ -6,7 +6,7 @@ Required properties:
 
 Required child nodes:
 - backlight    : container node for backlight following the binding
-               in video/backlight/sky81452-backlight.txt
+               in leds/backlight/sky81452-backlight.txt
 - regulator    : container node for regulators following the binding
                in regulator/sky81452-regulator.txt
 
index 37bf7f1aa70a23a310c6a00f4f5e864f48b7ebff..23fc2f21f5a467bdf5ae4bb42655d0e7c2bda5f8 100644 (file)
@@ -56,6 +56,7 @@ Optional nodes:
    bindings/input/matrix-keymap.txt
  - linux,no-autorepeat: do no enable autorepeat feature.
  - wakeup-source: use any event on keypad as wakeup event.
+                 (Legacy property supported: "linux,wakeup")
 
 Example:
 
index f693baf87264d6525b105c0eb244730111b47820..ed23b9bedfdc05425fe7f01486a4f5ed7c7f8e95 100644 (file)
@@ -68,7 +68,8 @@ polarity is in effect.
 
 Optional SDIO properties:
 - keep-power-in-suspend: Preserves card power during a suspend/resume cycle
-- enable-sdio-wakeup: Enables wake up of host system on SDIO IRQ assertion
+- wakeup-source: Enables wake up of host system on SDIO IRQ assertion
+                (Legacy property supported: "enable-sdio-wakeup")
 
 
 MMC power sequences:
@@ -118,7 +119,7 @@ sdhci@ab000000 {
        wp-gpios = <&gpio 70 0>;
        max-frequency = <50000000>;
        keep-power-in-suspend;
-       enable-sdio-wakeup;
+       wakeup-source;
        mmc-pwrseq = <&sdhci0_pwrseq>
 }
 
index f8fbe9af7b2f276350426b299c6030adb9464640..08dcfad09f8d7bdfd60e5254ef98aa42ed07a11d 100644 (file)
@@ -1,12 +1,12 @@
 PCI bus bridges have standardized Device Tree bindings:
 
 PCI Bus Binding to: IEEE Std 1275-1994
-http://www.openfirmware.org/ofwg/bindings/pci/pci2_1.pdf
+http://www.firmware.org/1275/bindings/pci/pci2_1.pdf
 
 And for the interrupt mapping part:
 
 Open Firmware Recommended Practice: Interrupt Mapping
-http://www.openfirmware.org/1275/practice/imap/imap0_9d.pdf
+http://www.firmware.org/1275/practice/imap/imap0_9d.pdf
 
 Additionally to the properties specified in the above standards a host bridge
 driver implementation may support the following properties:
diff --git a/Documentation/devicetree/bindings/power/wakeup-source.txt b/Documentation/devicetree/bindings/power/wakeup-source.txt
new file mode 100644 (file)
index 0000000..963c6df
--- /dev/null
@@ -0,0 +1,71 @@
+Specifying wakeup capability for devices
+============================================
+
+Any device nodes
+----------------
+Nodes that describe devices which has wakeup capability must contain an
+"wakeup-source" boolean property.
+
+Also, if device is marked as a wakeup source, then all the primary
+interrupt(s) can be used as wakeup interrupt(s).
+
+However if the devices have dedicated interrupt as the wakeup source
+then they need to specify/identify the same using device specific
+interrupt name. In such cases only that interrupt can be used as wakeup
+interrupt.
+
+List of legacy properties and respective binding document
+---------------------------------------------------------
+
+1. "enable-sdio-wakeup"                Documentation/devicetree/bindings/mmc/mmc.txt
+2. "gpio-key,wakeup"           Documentation/devicetree/bindings/input/gpio-keys{,-polled}.txt
+3. "has-tpo"                   Documentation/devicetree/bindings/rtc/rtc-opal.txt
+4. "isil,irq2-can-wakeup-machine" Documentation/devicetree/bindings/rtc/isil,isl12057.txt
+5. "linux,wakeup"              Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt
+                               Documentation/devicetree/bindings/mfd/tc3589x.txt
+                               Documentation/devicetree/bindings/input/ads7846.txt
+6. "linux,keypad-wakeup"       Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt
+7. "linux,input-wakeup"                Documentation/devicetree/bindings/input/samsung-keypad.txt
+8. "nvidia,wakeup-source"      Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt
+
+Examples
+--------
+
+1. With "wakeup" interrupt name
+
+       device@10000 {
+               compatible      = "vendor,device-id";
+               reg             = <0x10000 0x1000>;
+               interrupts      = <0 19 4>, <0 21 4>, <0 22 4>;
+               interrupt-names = "ack", "err", "wakeup";
+               wakeup-source;
+       };
+
+2. Without "wakeup" interrupt name
+
+       embedded-controller {
+               compatible = "google,cros-ec-i2c";
+               reg = <0x1e>;
+               interrupts = <6 0>;
+               interrupt-parent = <&gpx1>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&ec_irq>;
+               wakeup-source;
+       };
+
+3. Without interrupts
+
+       gpio_keys {
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               button@1 {
+                       debounce_interval = <50>;
+                       wakeup-source;
+                       linux,code = <116>;
+                       label = "POWER";
+                       gpios = <&iofpga_gpio0 0 0x4>;
+               };
+               [....]
+       };
index 501c39ceae795e7c784c1fd3c2fd3781aaa86260..cf83e0940302cbf3b1795be0a06df1a8191220ef 100644 (file)
@@ -5,7 +5,7 @@ consisting of a compatible field, an address and possibly an interrupt
 line).
 
 Nonetheless, it also supports an option boolean property
-("isil,irq2-can-wakeup-machine") to handle the specific use-case found
+("wakeup-source") to handle the specific use-case found
 on at least three in-tree users of the chip (NETGEAR ReadyNAS 102, 104
 and 2120 ARM-based NAS); On those devices, the IRQ#2 pin of the chip
 (associated with the alarm supported by the driver) is not connected
@@ -22,9 +22,9 @@ Required properties supported by the device:
 
 Optional properties:
 
- - "isil,irq2-can-wakeup-machine": mark the chip as a wakeup source,
-   independently of the availability of an IRQ line connected to the
-   SoC.
+ - "wakeup-source": mark the chip as a wakeup source, independently of
+    the availability of an IRQ line connected to the SoC.
+    (Legacy property supported: "isil,irq2-can-wakeup-machine")
 
  - "interrupt-parent", "interrupts": for passing the interrupt line
    of the SoC connected to IRQ#2 of the RTC chip.
@@ -74,5 +74,5 @@ PMIC, allowing the device to be started based on configured alarm:
        isl12057: isl12057@68 {
                compatible = "isil,isl12057";
                reg = <0x68>;
-               isil,irq2-can-wakeup-machine;
+               wakeup-source;
        };
index af87e5ecac540ce965c3e8ec0f36900d9f3e4ccb..a1734e5cb75bb6279beef456f6acf2fdef043045 100644 (file)
@@ -5,12 +5,13 @@ Required properties:
 - comapatible: Should be "ibm,opal-rtc"
 
 Optional properties:
-- has-tpo: Decides if the wakeup is supported or not.
+- wakeup-source: Decides if the wakeup is supported or not
+                (Legacy property supported: "has-tpo")
 
 Example:
        rtc {
                compatible = "ibm,opal-rtc";
-               has-tpo;
+               wakeup-source;
                phandle = <0x10000029>;
                linux,phandle = <0x10000029>;
        };
index 669b8140dd796db70aa738a451e15d2199a335a3..d10cc06c0c37e1389ba9ba996924e68b1e505aba 100644 (file)
@@ -10,7 +10,6 @@ Required properties:
                                mvrl,pxa168-ssp
                                mrvl,pxa910-ssp
                                mrvl,ce4100-ssp
-                               mrvl,lpss-ssp
 
        - reg:          The memory base
        - dmas:         Two dma phandles, one for rx, one for tx
index cbae3d9a0278076873e5274f47b4881a92b51c0b..77863aefe9ef1eafe648b530c1570333aea7940b 100644 (file)
@@ -19,7 +19,7 @@ Optional properties:
           must correspond to the PCLK clocking the internal logic
           of the block. Just listing one clock (the first one) is
           deprecated.
-- clocks-names:
+- clock-names:
           When present, the first clock listed must be named
           "uartclk" and the second clock listed must be named
           "apb_pclk"
diff --git a/Documentation/devicetree/bindings/usb/samsung-usbphy.txt b/Documentation/devicetree/bindings/usb/samsung-usbphy.txt
deleted file mode 100644 (file)
index 33fd354..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-SAMSUNG USB-PHY controllers
-
-** Samsung's usb 2.0 phy transceiver
-
-The Samsung's usb 2.0 phy transceiver is used for controlling
-usb 2.0 phy for s3c-hsotg as well as ehci-s5p and ohci-exynos
-usb controllers across Samsung SOCs.
-TODO: Adding the PHY binding with controller(s) according to the under
-development generic PHY driver.
-
-Required properties:
-
-Exynos4210:
-- compatible : should be "samsung,exynos4210-usb2phy"
-- reg : base physical address of the phy registers and length of memory mapped
-       region.
-- clocks: Clock IDs array as required by the controller.
-- clock-names: names of clock correseponding IDs clock property as requested
-              by the controller driver.
-
-Exynos5250:
-- compatible : should be "samsung,exynos5250-usb2phy"
-- reg : base physical address of the phy registers and length of memory mapped
-       region.
-
-Optional properties:
-- #address-cells: should be '1' when usbphy node has a child node with 'reg'
-                 property.
-- #size-cells: should be '1' when usbphy node has a child node with 'reg'
-              property.
-- ranges: allows valid translation between child's address space and parent's
-         address space.
-
-- The child node 'usbphy-sys' to the node 'usbphy' is for the system controller
-  interface for usb-phy. It should provide the following information required by
-  usb-phy controller to control phy.
-  - reg : base physical address of PHY_CONTROL registers.
-         The size of this register is the total sum of size of all PHY_CONTROL
-         registers that the SoC has. For example, the size will be
-         '0x4' in case we have only one PHY_CONTROL register (e.g.
-         OTHERS register in S3C64XX or USB_PHY_CONTROL register in S5PV210)
-         and, '0x8' in case we have two PHY_CONTROL registers (e.g.
-         USBDEVICE_PHY_CONTROL and USBHOST_PHY_CONTROL registers in exynos4x).
-         and so on.
-
-Example:
- - Exynos4210
-
-       usbphy@125B0000 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "samsung,exynos4210-usb2phy";
-               reg = <0x125B0000 0x100>;
-               ranges;
-
-               clocks = <&clock 2>, <&clock 305>;
-               clock-names = "xusbxti", "otg";
-
-               usbphy-sys {
-                       /* USB device and host PHY_CONTROL registers */
-                       reg = <0x10020704 0x8>;
-               };
-       };
-
-
-** Samsung's usb 3.0 phy transceiver
-
-Starting exynso5250, Samsung's SoC have usb 3.0 phy transceiver
-which is used for controlling usb 3.0 phy for dwc3-exynos usb 3.0
-controllers across Samsung SOCs.
-
-Required properties:
-
-Exynos5250:
-- compatible : should be "samsung,exynos5250-usb3phy"
-- reg : base physical address of the phy registers and length of memory mapped
-       region.
-- clocks: Clock IDs array as required by the controller.
-- clock-names: names of clocks correseponding to IDs in the clock property
-              as requested by the controller driver.
-
-Optional properties:
-- #address-cells: should be '1' when usbphy node has a child node with 'reg'
-                 property.
-- #size-cells: should be '1' when usbphy node has a child node with 'reg'
-              property.
-- ranges: allows valid translation between child's address space and parent's
-         address space.
-
-- The child node 'usbphy-sys' to the node 'usbphy' is for the system controller
-  interface for usb-phy. It should provide the following information required by
-  usb-phy controller to control phy.
-  - reg : base physical address of PHY_CONTROL registers.
-         The size of this register is the total sum of size of all PHY_CONTROL
-         registers that the SoC has. For example, the size will be
-         '0x4' in case we have only one PHY_CONTROL register (e.g.
-         OTHERS register in S3C64XX or USB_PHY_CONTROL register in S5PV210)
-         and, '0x8' in case we have two PHY_CONTROL registers (e.g.
-         USBDEVICE_PHY_CONTROL and USBHOST_PHY_CONTROL registers in exynos4x).
-         and so on.
-
-Example:
-       usbphy@12100000 {
-               compatible = "samsung,exynos5250-usb3phy";
-               reg = <0x12100000 0x100>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-
-               clocks = <&clock 1>, <&clock 286>;
-               clock-names = "ext_xtal", "usbdrd30";
-
-               usbphy-sys {
-                       /* USB device and host PHY_CONTROL registers */
-                       reg = <0x10040704 0x8>;
-               };
-       };
index 68747d979623173e792ed41ef7864be69011bc73..abc34e3652eaa9cf65c016a37c2da60ea0eaecae 100644 (file)
@@ -52,6 +52,7 @@ cirrus        Cirrus Logic, Inc.
 cloudengines   Cloud Engines, Inc.
 cnm    Chips&Media, Inc.
 cnxt   Conexant Systems, Inc.
+compulab       CompuLab Ltd.
 cortina        Cortina Systems, Inc.
 cosmic Cosmic Circuits
 crystalfontz   Crystalfontz America, Inc.
@@ -195,6 +196,7 @@ schindler   Schindler
 seagate        Seagate Technology PLC
 semtech        Semtech Corporation
 sharp  Sharp Corporation
+sigma  Sigma Designs, Inc.
 sil    Silicon Image
 silabs Silicon Laboratories
 siliconmitus   Silicon Mitus, Inc.
index 8a27a48304a4c0127d97996d73c7d7dc0515d8a3..cf0cf34eeb24b14ef070735e83d25b0f7f6aecec 100644 (file)
@@ -121,7 +121,7 @@ $(boot_targets): vmlinux
        $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
 
 dtbs: scripts
-       $(Q)$(MAKE) $(build)=$(boot)/dts dtbs
+       $(Q)$(MAKE) $(build)=$(boot)/dts
 
 archclean:
        $(Q)$(MAKE) $(clean)=$(boot)
index b0e3f19bbd07e32cb57c91f803302603ebe429fc..a09f11b71e663d59f5f636339c0fb24704563b34 100644 (file)
@@ -6,10 +6,12 @@ ifneq ($(CONFIG_ARC_BUILTIN_DTB_NAME),"")
 endif
 
 obj-y   += $(builtindtb-y).dtb.o
-targets += $(builtindtb-y).dtb
+dtb-y := $(builtindtb-y).dtb
 
 .SECONDARY: $(obj)/$(builtindtb-y).dtb.S
 
-dtbs:  $(addprefix  $(obj)/, $(builtindtb-y).dtb)
+dtstree                := $(srctree)/$(src)
+dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
 
+always := $(dtb-y)
 clean-files := *.dtb  *.dtb.S
index 4d5f825c575b5582918fbe9e2e0e863b975a73c5..30bbc3746130a56e54fa665a763894fe4ec02e6a 100644 (file)
@@ -779,5 +779,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
 dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb
 endif
 
+dtstree                := $(srctree)/$(src)
+dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
+
 always         := $(dtb-y)
 clean-files    := *.dtb
index f58560614aefd6dda5601775260f695048bbdaf6..eb3c42d971750372d3194cf935f9148b9892f53c 100644 (file)
@@ -15,3 +15,9 @@ dts-dirs += sprd
 dts-dirs += xilinx
 
 subdir-y       := $(dts-dirs)
+
+dtstree                := $(srctree)/$(src)
+
+dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(foreach d,$(dts-dirs), $(wildcard $(dtstree)/$(d)/*.dts)))
+
+always         := $(dtb-y)
index 0abaf1ad830eeab6db9f9bebed4f8f3784831d66..6c08467c6a3ab56e9c3b6a323421f7fd2b706317 100644 (file)
@@ -8,5 +8,8 @@ dtb-$(CONFIG_H8300H_SIM) := h8300h_sim.dtb
 dtb-$(CONFIG_H8S_SIM) := h8s_sim.dtb
 dtb-$(CONFIG_H8S_EDOSK2674) := edosk2674.dtb
 
+dtstree                := $(srctree)/$(src)
+dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
+
 always     := $(dtb-y)
 clean-files := *.dtb.S *.dtb
index 9739857bdedcb89fe6847d26fdef70041a70228d..033a58214119535488836cd805ff17ce6567cc3d 100644 (file)
@@ -72,7 +72,7 @@ $(boot_targets): vmlinux
        $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
 
 dtbs: scripts
-       $(Q)$(MAKE) $(build)=$(boot)/dts dtbs
+       $(Q)$(MAKE) $(build)=$(boot)/dts
 
 archclean:
        $(Q)$(MAKE) $(clean)=$(boot)
index 72c12187942606316950775222df89e332b885b0..097c6da4547fb2d1b8896e31d28a3b230912a47b 100644 (file)
@@ -12,11 +12,10 @@ endif
 dtb-$(CONFIG_METAG_BUILTIN_DTB)        += $(builtindtb-y).dtb
 obj-$(CONFIG_METAG_BUILTIN_DTB)        += $(builtindtb-y).dtb.o
 
-targets        += dtbs
-targets        += $(dtb-y)
+dtstree                := $(srctree)/$(src)
+dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
 
 .SECONDARY: $(obj)/$(builtindtb-y).dtb.S
 
-dtbs: $(addprefix $(obj)/, $(dtb-y))
-
+always += $(dtb-y)
 clean-files += *.dtb *.dtb.S
index 778a34028c1b1fb6b67754053e24ea09828eee31..bac7b8dab9a4907db6733da6e66a6a85fe89a92d 100644 (file)
@@ -9,6 +9,9 @@ dts-dirs        += ralink
 
 obj-y          := $(addsuffix /, $(dts-dirs))
 
+dtstree                := $(srctree)/$(src)
+dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(foreach d,$(dts-dirs), $(wildcard $(dtstree)/$(d)/*.dts)))
+
 always         := $(dtb-y)
 subdir-y       := $(dts-dirs)
 clean-files    := *.dtb *.dtb.S
index f9e6a068aafd3ca3c296a9bee832dbd74bdb99ab..709b5748a2d7ed44aeacf7d378cc99b4e37c0939 100644 (file)
@@ -101,6 +101,10 @@ zImage: vmlinux
 %.dtb:
        $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
 
+dtbs: scripts
+       $(Q)$(MAKE) $(build)=$(boot)/dts
+
 define archhelp
   @echo '* zImage      - Compressed kernel image (arch/xtensa/boot/images/zImage.*)'
+  @echo '  dtbs        - Build device tree blobs for enabled boards'
 endef
index 5f711bba830790c49d54c9fd926f0bf128dae01f..a15e241c9153c4791fe89977e03775c824e3acc1 100644 (file)
@@ -12,4 +12,9 @@ ifneq ($(CONFIG_BUILTIN_DTB),"")
 obj-$(CONFIG_OF) += $(BUILTIN_DTB)
 endif
 
-clean-files := *.dtb.S
+dtstree := $(srctree)/$(src)
+dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
+
+always += $(dtb-y)
+clean-files += *.dtb *.dtb.S
+
index 334ec7ef1960cf46b69a27315a1dbcccbf39dd8b..b7d56c5ea3c688fe03c7b5edda4f62c0906a9fc7 100644 (file)
@@ -1066,7 +1066,7 @@ int device_add(struct device *dev)
                dev->kobj.parent = kobj;
 
        /* use parent numa_node */
-       if (parent)
+       if (parent && (dev_to_node(dev) == NUMA_NO_NODE))
                set_dev_node(dev, dev_to_node(parent));
 
        /* first, register with generic layer. */
index 59bb8556e43ac8f975485465ca8d1b0fdfeba3c5..e2a48415d9691059f1beb2afee7f134019d65ecf 100644 (file)
@@ -23,6 +23,16 @@ config OF_UNITTEST
 
          If unsure, say N here, but this option is safe to enable.
 
+config OF_ALL_DTBS
+       bool "Build all Device Tree Blobs"
+       depends on COMPILE_TEST
+       select DTC
+       help
+         This option builds all possible Device Tree Blobs (DTBs) for the
+         current architecture.
+
+         If unsure, say N here, but this option is safe to enable.
+
 config OF_FLATTREE
        bool
        select DTC
index 384574c3987c337444181d68346ce9d95963f027..cd53fe4a0c8684900a94fb4bee76f9bd668e3837 100644 (file)
@@ -330,6 +330,12 @@ int of_pci_range_to_resource(struct of_pci_range *range,
                }
                res->start = port;
        } else {
+               if ((sizeof(resource_size_t) < 8) &&
+                   upper_32_bits(range->cpu_addr)) {
+                       err = -EINVAL;
+                       goto invalid_range;
+               }
+
                res->start = range->cpu_addr;
        }
        res->end = res->start + range->size - 1;
index 8b5a187a768280c25efce25284f09875347834f1..017dd94f16ea3dd8ebbc37b81188f2d47933e878 100644 (file)
@@ -375,10 +375,7 @@ bool __weak arch_find_n_match_cpu_physical_id(struct device_node *cpun,
                                           cpu, thread))
                return true;
 
-       if (__of_find_n_match_cpu_property(cpun, "reg", cpu, thread))
-               return true;
-
-       return false;
+       return __of_find_n_match_cpu_property(cpun, "reg", cpu, thread);
 }
 
 /**
index 8b91ea241b10f553f058885b5cc083a35e2a81fe..e5f47cec75f34e046b15efbc5bcdc50073eff5c0 100644 (file)
@@ -60,11 +60,12 @@ int of_device_add(struct platform_device *ofdev)
        ofdev->name = dev_name(&ofdev->dev);
        ofdev->id = -1;
 
-       /* device_add will assume that this device is on the same node as
-        * the parent. If there is no parent defined, set the node
-        * explicitly */
-       if (!ofdev->dev.parent)
-               set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->dev.of_node));
+       /*
+        * If this device has not binding numa node in devicetree, that is
+        * of_node_to_nid returns NUMA_NO_NODE. device_add will assume that this
+        * device is on the same node as the parent.
+        */
+       set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->dev.of_node));
 
        return device_add(&ofdev->dev);
 }
index 6e82bc42373ba39b552adba1271c8e436fcc797c..d2430298a309a86d3f2110623d3728b9dedb228f 100644 (file)
@@ -184,7 +184,7 @@ static void * unflatten_dt_node(const void *blob,
        struct property *pp, **prev_pp = NULL;
        const char *pathp;
        unsigned int l, allocl;
-       static int depth = 0;
+       static int depth;
        int old_depth;
        int offset;
        int has_name = 0;
@@ -813,20 +813,24 @@ static int __init early_init_dt_scan_chosen_serial(void)
        if (!p || !l)
                return -ENOENT;
 
+       /* Remove console options if present */
+       l = strchrnul(p, ':') - p;
+
        /* Get the node specified by stdout-path */
-       offset = fdt_path_offset(fdt, p);
+       offset = fdt_path_offset_namelen(fdt, p, l);
        if (offset < 0)
                return -ENODEV;
 
        while (match->compatible[0]) {
-               unsigned long addr;
+               u64 addr;
+
                if (fdt_node_check_compatible(fdt, offset, match->compatible)) {
                        match++;
                        continue;
                }
 
                addr = fdt_translate_address(fdt, offset);
-               if (!addr)
+               if (addr == OF_BAD_ADDR)
                        return -ENXIO;
 
                of_setup_earlycon(addr, match->data);
index 0baf626da56ac5b142d75367a7cfdb52747c24ce..902b89be7217137726be7eb1ab19263c0372635a 100644 (file)
@@ -53,7 +53,7 @@ EXPORT_SYMBOL_GPL(irq_of_parse_and_map);
  * Returns a pointer to the interrupt parent node, or NULL if the interrupt
  * parent could not be determined.
  */
-struct device_node *of_irq_find_parent(struct device_node *child)
+static struct device_node *of_irq_find_parent(struct device_node *child)
 {
        struct device_node *p;
        const __be32 *parp;
@@ -501,10 +501,12 @@ void __init of_irq_init(const struct of_device_id *matches)
                 * pointer, interrupt-parent device_node etc.
                 */
                desc = kzalloc(sizeof(*desc), GFP_KERNEL);
-               if (WARN_ON(!desc))
+               if (WARN_ON(!desc)) {
+                       of_node_put(np);
                        goto err;
+               }
 
-               desc->dev = np;
+               desc->dev = of_node_get(np);
                desc->interrupt_parent = of_irq_find_parent(np);
                if (desc->interrupt_parent == np)
                        desc->interrupt_parent = NULL;
@@ -575,6 +577,7 @@ void __init of_irq_init(const struct of_device_id *matches)
 err:
        list_for_each_entry_safe(desc, temp_desc, &intc_desc_list, list) {
                list_del(&desc->list);
+               of_node_put(desc->dev);
                kfree(desc);
        }
 }
index d0c8902dfbf4c564cf50af70b5b6cbb6798905c5..ff27177f49edbdd3105b319c7deee29ed48da869 100644 (file)
@@ -249,8 +249,10 @@ int of_pci_get_host_bridge_resources(struct device_node *dev,
                }
 
                err = of_pci_range_to_resource(&range, dev, res);
-               if (err)
-                       goto conversion_failed;
+               if (err) {
+                       kfree(res);
+                       continue;
+               }
 
                if (resource_type(res) == IORESOURCE_IO) {
                        if (!io_base) {
index 726ebe792813011e69670a19ada489159ea6b64d..62f467b8ccae940a931a2a08ce530a9a14f46a1f 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Device tree based initialization code for reserved memory.
  *
- * Copyright (c) 2013, The Linux Foundation. All Rights Reserved.
+ * Copyright (c) 2013, 2015 The Linux Foundation. All Rights Reserved.
  * Copyright (c) 2013,2014 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com
  * Author: Marek Szyprowski <m.szyprowski@samsung.com>
@@ -20,6 +20,7 @@
 #include <linux/mm.h>
 #include <linux/sizes.h>
 #include <linux/of_reserved_mem.h>
+#include <linux/sort.h>
 
 #define MAX_RESERVED_REGIONS   16
 static struct reserved_mem reserved_mem[MAX_RESERVED_REGIONS];
@@ -197,12 +198,52 @@ static int __init __reserved_mem_init_node(struct reserved_mem *rmem)
        return -ENOENT;
 }
 
+static int __init __rmem_cmp(const void *a, const void *b)
+{
+       const struct reserved_mem *ra = a, *rb = b;
+
+       return ra->base - rb->base;
+}
+
+static void __init __rmem_check_for_overlap(void)
+{
+       int i;
+
+       if (reserved_mem_count < 2)
+               return;
+
+       sort(reserved_mem, reserved_mem_count, sizeof(reserved_mem[0]),
+            __rmem_cmp, NULL);
+       for (i = 0; i < reserved_mem_count - 1; i++) {
+               struct reserved_mem *this, *next;
+
+               this = &reserved_mem[i];
+               next = &reserved_mem[i + 1];
+               if (!(this->base && next->base))
+                       continue;
+               if (this->base + this->size > next->base) {
+                       phys_addr_t this_end, next_end;
+
+                       this_end = this->base + this->size;
+                       next_end = next->base + next->size;
+                       WARN(1,
+                            "Reserved memory: OVERLAP DETECTED!\n%s (%pa--%pa) overlaps with %s (%pa--%pa)\n",
+                            this->name, &this->base, &this_end,
+                            next->name, &next->base, &next_end);
+               }
+       }
+}
+
 /**
  * fdt_init_reserved_mem - allocate and init all saved reserved memory regions
  */
 void __init fdt_init_reserved_mem(void)
 {
        int i;
+
+       /* check for overlapping reserved regions */
+       __rmem_check_for_overlap();
+
        for (i = 0; i < reserved_mem_count; i++) {
                struct reserved_mem *rmem = &reserved_mem[i];
                unsigned long node = rmem->fdt_node;
index 24e025f7929932cb1dcf8c0a834b308a30b99fe2..54e5af9d737742db1b4cb83ef3101a4ee41c7e27 100644 (file)
@@ -149,6 +149,7 @@ static int of_overlay_apply_one(struct of_overlay *ov,
                        pr_err("%s: Failed to apply single node @%s/%s\n",
                                        __func__, target->full_name,
                                        child->name);
+                       of_node_put(child);
                        return ret;
                }
        }
@@ -417,8 +418,10 @@ static int overlay_subtree_check(struct device_node *tree,
                return 1;
 
        for_each_child_of_node(tree, child) {
-               if (overlay_subtree_check(child, dn))
+               if (overlay_subtree_check(child, dn)) {
+                       of_node_put(child);
                        return 1;
+               }
        }
 
        return 0;
index 1001efaedcb8681f08f575ec80b743240dc80893..af98343614d8eeebeabc1fa0c74337029cd70335 100644 (file)
@@ -405,8 +405,10 @@ int of_platform_bus_probe(struct device_node *root,
                if (!of_match_node(matches, child))
                        continue;
                rc = of_platform_bus_create(child, matches, NULL, parent, false);
-               if (rc)
+               if (rc) {
+                       of_node_put(child);
                        break;
+               }
        }
 
        of_node_put(root);
@@ -447,8 +449,10 @@ int of_platform_populate(struct device_node *root,
 
        for_each_child_of_node(root, child) {
                rc = of_platform_bus_create(child, matches, lookup, parent, true);
-               if (rc)
+               if (rc) {
+                       of_node_put(child);
                        break;
+               }
        }
        of_node_set_flag(root, OF_POPULATED_BUS);
 
index 9f71770b6226f9ed3d4ceab7bb95ea3f4ba55b6c..e16ea5717b7f76df9c4734ee0f9373fb8e758b45 100644 (file)
@@ -205,16 +205,20 @@ static int __init of_unittest_check_node_linkage(struct device_node *np)
                if (child->parent != np) {
                        pr_err("Child node %s links to wrong parent %s\n",
                                 child->name, np->name);
-                       return -EINVAL;
+                       rc = -EINVAL;
+                       goto put_child;
                }
 
                rc = of_unittest_check_node_linkage(child);
                if (rc < 0)
-                       return rc;
+                       goto put_child;
                count += rc;
        }
 
        return count + 1;
+put_child:
+       of_node_put(child);
+       return rc;
 }
 
 static void __init of_unittest_check_tree_linkage(void)
index 65d969246a4d02e1ee8854451c923d5003941d31..79e1d97bcec3031cd17764645f3aa30eab2fe349 100644 (file)
@@ -46,6 +46,7 @@ extern int of_irq_get(struct device_node *dev, int index);
 extern int of_irq_get_byname(struct device_node *dev, const char *name);
 extern int of_irq_to_resource_table(struct device_node *dev,
                struct resource *res, int nr_irqs);
+extern void of_msi_configure(struct device *dev, struct device_node *np);
 extern struct irq_domain *of_msi_get_domain(struct device *dev,
                                            struct device_node *np,
                                            enum irq_domain_bus_token token);
@@ -69,6 +70,9 @@ static inline int of_irq_to_resource_table(struct device_node *dev,
 {
        return 0;
 }
+static inline void of_msi_configure(struct device *dev, struct device_node *np)
+{
+}
 static inline struct irq_domain *of_msi_get_domain(struct device *dev,
                                                   struct device_node *np,
                                                   enum irq_domain_bus_token token)
@@ -82,29 +86,22 @@ static inline struct irq_domain *of_msi_map_get_device_domain(struct device *dev
 }
 #endif
 
-#if defined(CONFIG_OF)
+#if defined(CONFIG_OF_IRQ) || defined(CONFIG_SPARC)
 /*
  * irq_of_parse_and_map() is used by all OF enabled platforms; but SPARC
  * implements it differently.  However, the prototype is the same for all,
  * so declare it here regardless of the CONFIG_OF_IRQ setting.
  */
 extern unsigned int irq_of_parse_and_map(struct device_node *node, int index);
-extern struct device_node *of_irq_find_parent(struct device_node *child);
-extern void of_msi_configure(struct device *dev, struct device_node *np);
 u32 of_msi_map_rid(struct device *dev, struct device_node *msi_np, u32 rid_in);
 
-#else /* !CONFIG_OF */
+#else /* !CONFIG_OF && !CONFIG_SPARC */
 static inline unsigned int irq_of_parse_and_map(struct device_node *dev,
                                                int index)
 {
        return 0;
 }
 
-static inline void *of_irq_find_parent(struct device_node *child)
-{
-       return NULL;
-}
-
 static inline u32 of_msi_map_rid(struct device *dev,
                                 struct device_node *msi_np, u32 rid_in)
 {